Skip to content

Remove global next_disambiguator state and handle it with a DisambiguatorState type #140453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 5, 2025
Merged

Remove global next_disambiguator state and handle it with a DisambiguatorState type #140453

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ac60bc
We always use the current item as parent, so no need to pass it
oli-obk Apr 26, 2025
e561ec0
Remove global `next_disambiguator` state and handle it with a `Disamb…
Zoxc Apr 29, 2025
df1f8d1
Update stable-mir test
Zoxc Apr 29, 2025
ddff387
Rename parameter to `override_def_path_data`
Zoxc May 2, 2025
efc51ce
Add `DefPathData::NestedStatic` instead of reusing `DefPathData::Anon…
Zoxc May 2, 2025
d16daf5
Add comment about the symbol on `AnonAssocTy`
Zoxc May 2, 2025
4869e20
Split `get_opt_name` hashing use into `hashed_symbol`
Zoxc May 2, 2025
6a48217
Move `DisambiguatorState` into `intern_const_alloc_recursive`
Zoxc May 2, 2025
9f8c6d5
Add comment on creation of `SyntheticCoroutineBody`
Zoxc May 4, 2025
acb50d5
Add comment on creation of lifetime inside opaque types
Zoxc May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update stable-mir test
  • Loading branch information
@Zoxc
Zoxc committed Apr 29, 2025
commit df1f8d140e637d927caa0610f47e320d75b76a7c
24 changes: 12 additions & 12 deletions tests/ui-fulldeps/stable-mir/check_assoc_items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ extern crate rustc_driver;
extern crate rustc_interface;
extern crate stable_mir;

use std::io::Write;
use std::collections::HashSet;
use stable_mir::CrateDef;
use stable_mir::*;
use stable_mir::ty::*;
use std::io::Write;
use std::ops::ControlFlow;

use stable_mir::ty::*;
use stable_mir::{CrateDef, *};

const CRATE_NAME: &str = "crate_assoc_items";

/// This function uses the Stable MIR APIs to get information about the test crate.
Expand All @@ -45,30 +45,30 @@ fn test_assoc_items() -> ControlFlow<()> {
let local_impls = local_crate.trait_impls();
let local_traits = local_crate.trait_decls();

let trait_assoc_item_defs: Vec<AssocDef> = local_traits[0].associated_items()
.iter().map(|assoc_item| assoc_item.def_id).collect();
let trait_assoc_item_defs: Vec<AssocDef> =
local_traits[0].associated_items().iter().map(|assoc_item| assoc_item.def_id).collect();
check_items(
&trait_assoc_item_defs,
&[
"ATrait::{anon_assoc#0}",
"ATrait::rpitit::{anon_assoc#0}",
"ATrait::rpitit",
"ATrait::Assoc",
"ATrait::assoc_fn_no_self",
"ATrait::assoc_fn_has_self",
]
],
);

let impl_assoc_item_defs: Vec<AssocDef> = local_impls[0].associated_items()
.iter().map(|assoc_item| assoc_item.def_id).collect();
let impl_assoc_item_defs: Vec<AssocDef> =
local_impls[0].associated_items().iter().map(|assoc_item| assoc_item.def_id).collect();
check_items(
&impl_assoc_item_defs,
&[
"<AStruct as ATrait>::{anon_assoc#0}",
"<AStruct as ATrait>::rpitit::{anon_assoc#0}",
"<AStruct as ATrait>::rpitit",
"<AStruct as ATrait>::Assoc",
"<AStruct as ATrait>::assoc_fn_no_self",
"<AStruct as ATrait>::assoc_fn_has_self",
]
],
);

ControlFlow::Continue(())
Expand Down
Loading