rust-analyzer

diff --git a/crates/base-db/src/lib.rs b/crates/base-db/src/lib.rs
index 26eef9ac0d..e438505c07 100644
--- a/crates/base-db/src/lib.rs
+++ b/crates/base-db/src/lib.rs

@@ -347,8 +347,7 @@ pub fn set_all_crates_with_durability(

///

/// **Warning**: do not use this query in `hir-*` crates! It kills incrementality across crate metadata modifications.

pub fn all_crates(db: &dyn salsa::Database) -> std::sync::Arc<[Crate]> {

- AllCrates::try_get(db)

- .map_or(std::sync::Arc::default(), |all_crates| all_crates.crates(db).into())

+ AllCrates::try_get(db).map_or(std::sync::Arc::default(), |all_crates| all_crates.crates(db))

}

// FIXME: VFS rewrite should allow us to get rid of this wrapper

diff --git a/crates/hir-def/src/expr_store/tests/body/block.rs b/crates/hir-def/src/expr_store/tests/body/block.rs
index 83594ee021..71fcced2d8 100644
--- a/crates/hir-def/src/expr_store/tests/body/block.rs
+++ b/crates/hir-def/src/expr_store/tests/body/block.rs

@@ -190,13 +190,13 @@ fn f() {

"#,

expect![[r#"

ModuleIdLt {

- [salsa id]: Id(3803),

+ [salsa id]: Id(3403),

krate: Crate(

- Id(2400),

+ Id(2000),

block: Some(

BlockId(

- 4801,

+ 4401,

}"#]],

diff --git a/crates/hir-def/src/macro_expansion_tests/mbe.rs b/crates/hir-def/src/macro_expansion_tests/mbe.rs
index d93df7af6a..7b5d0103e6 100644
--- a/crates/hir-def/src/macro_expansion_tests/mbe.rs
+++ b/crates/hir-def/src/macro_expansion_tests/mbe.rs

@@ -35,9 +35,9 @@ macro_rules! f {

};

}

-struct#0:MacroRules[BE8F, 0]@58..64#18432# MyTraitMap2#0:MacroCall[BE8F, 0]@31..42#ROOT2024# {#0:MacroRules[BE8F, 0]@72..73#18432#

- map#0:MacroRules[BE8F, 0]@86..89#18432#:#0:MacroRules[BE8F, 0]@89..90#18432# #0:MacroRules[BE8F, 0]@89..90#18432#::#0:MacroRules[BE8F, 0]@91..93#18432#std#0:MacroRules[BE8F, 0]@93..96#18432#::#0:MacroRules[BE8F, 0]@96..98#18432#collections#0:MacroRules[BE8F, 0]@98..109#18432#::#0:MacroRules[BE8F, 0]@109..111#18432#HashSet#0:MacroRules[BE8F, 0]@111..118#18432#<#0:MacroRules[BE8F, 0]@118..119#18432#(#0:MacroRules[BE8F, 0]@119..120#18432#)#0:MacroRules[BE8F, 0]@120..121#18432#>#0:MacroRules[BE8F, 0]@121..122#18432#,#0:MacroRules[BE8F, 0]@122..123#18432#

-}#0:MacroRules[BE8F, 0]@132..133#18432#

+struct#0:MacroRules[BE8F, 0]@58..64#17408# MyTraitMap2#0:MacroCall[BE8F, 0]@31..42#ROOT2024# {#0:MacroRules[BE8F, 0]@72..73#17408#

+ map#0:MacroRules[BE8F, 0]@86..89#17408#:#0:MacroRules[BE8F, 0]@89..90#17408# #0:MacroRules[BE8F, 0]@89..90#17408#::#0:MacroRules[BE8F, 0]@91..93#17408#std#0:MacroRules[BE8F, 0]@93..96#17408#::#0:MacroRules[BE8F, 0]@96..98#17408#collections#0:MacroRules[BE8F, 0]@98..109#17408#::#0:MacroRules[BE8F, 0]@109..111#17408#HashSet#0:MacroRules[BE8F, 0]@111..118#17408#<#0:MacroRules[BE8F, 0]@118..119#17408#(#0:MacroRules[BE8F, 0]@119..120#17408#)#0:MacroRules[BE8F, 0]@120..121#17408#>#0:MacroRules[BE8F, 0]@121..122#17408#,#0:MacroRules[BE8F, 0]@122..123#17408#

+}#0:MacroRules[BE8F, 0]@132..133#17408#

"#]],

);

}

@@ -197,7 +197,7 @@ macro_rules! mk_struct {

#[macro_use]

mod foo;

-struct#1:MacroRules[DB0C, 0]@59..65#18432# Foo#0:MacroCall[DB0C, 0]@32..35#ROOT2024#(#1:MacroRules[DB0C, 0]@70..71#18432#u32#0:MacroCall[DB0C, 0]@41..44#ROOT2024#)#1:MacroRules[DB0C, 0]@74..75#18432#;#1:MacroRules[DB0C, 0]@75..76#18432#

+struct#1:MacroRules[DB0C, 0]@59..65#17408# Foo#0:MacroCall[DB0C, 0]@32..35#ROOT2024#(#1:MacroRules[DB0C, 0]@70..71#17408#u32#0:MacroCall[DB0C, 0]@41..44#ROOT2024#)#1:MacroRules[DB0C, 0]@74..75#17408#;#1:MacroRules[DB0C, 0]@75..76#17408#

"#]],

);

}

@@ -423,10 +423,10 @@ m! { foo, bar }

macro_rules! m {

($($i:ident),*) => ( impl Bar { $(fn $i() {})* } );

}

-impl#\18432# Bar#\18432# {#\18432#

- fn#\18432# foo#\ROOT2024#(#\18432#)#\18432# {#\18432#}#\18432#

- fn#\18432# bar#\ROOT2024#(#\18432#)#\18432# {#\18432#}#\18432#

-}#\18432#

+impl#\17408# Bar#\17408# {#\17408#

+ fn#\17408# foo#\ROOT2024#(#\17408#)#\17408# {#\17408#}#\17408#

+ fn#\17408# bar#\ROOT2024#(#\17408#)#\17408# {#\17408#}#\17408#

+}#\17408#

"#]],

);

}

diff --git a/crates/hir-def/src/nameres/tests/incremental.rs b/crates/hir-def/src/nameres/tests/incremental.rs
index 82d7a7114a..0f1828abce 100644
--- a/crates/hir-def/src/nameres/tests/incremental.rs
+++ b/crates/hir-def/src/nameres/tests/incremental.rs

@@ -167,22 +167,22 @@ fn no() {}

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"EnumVariants::of_",

]

"#]],

expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -225,16 +225,16 @@ pub struct S {}

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"decl_macro_expander_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"macro_def_shim",

"file_item_tree_query",

@@ -245,7 +245,7 @@ pub struct S {}

"#]],

expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -283,21 +283,21 @@ fn f() { foo }

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"crate_local_def_map",

"proc_macros_for_crate_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"macro_def_shim",

"file_item_tree_query",

@@ -310,7 +310,7 @@ fn f() { foo }

"#]],

expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -407,22 +407,22 @@ pub struct S {}

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"crate_local_def_map",

"proc_macros_for_crate_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"decl_macro_expander_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"macro_def_shim",

"file_item_tree_query",

@@ -446,7 +446,7 @@ pub struct S {}

"#]],

expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -524,16 +524,16 @@ m!(Z);

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"decl_macro_expander_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"macro_def_shim",

"file_item_tree_query",

@@ -571,7 +571,7 @@ m!(Z);

&[("file_item_tree_query", 1), ("parse_macro_expansion_shim", 0)],

expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -611,7 +611,7 @@ pub type Ty = ();

[

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

]

"#]],

@@ -629,7 +629,7 @@ pub type Ty = ();

&[("file_item_tree_query", 1), ("parse", 1)],

expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

diff --git a/crates/hir-ty/src/tests/incremental.rs b/crates/hir-ty/src/tests/incremental.rs
index e806999cb4..7cda259664 100644
--- a/crates/hir-ty/src/tests/incremental.rs
+++ b/crates/hir-ty/src/tests/incremental.rs

@@ -31,11 +31,11 @@ fn foo() -> i32 {

&[("InferenceResult::for_body_", 1)],

expect_test::expect![[r#"

[

- "source_root_crates_shim",

+ "source_root_crates",

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"InferenceResult::for_body_",

"FunctionSignature::of_",

@@ -76,7 +76,7 @@ fn foo() -> i32 {

&[("InferenceResult::for_body_", 0)],

expect_test::expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -119,11 +119,11 @@ fn baz() -> i32 {

&[("InferenceResult::for_body_", 3)],

expect_test::expect![[r#"

[

- "source_root_crates_shim",

+ "source_root_crates",

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"InferenceResult::for_body_",

"FunctionSignature::of_",

@@ -189,7 +189,7 @@ fn baz() -> i32 {

&[("InferenceResult::for_body_", 1)],

expect_test::expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -239,11 +239,11 @@ $0",

&[("TraitImpls::for_crate_", 1)],

expect_test::expect![[r#"

[

- "source_root_crates_shim",

+ "source_root_crates",

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"TraitImpls::for_crate_",

"lang_items",

@@ -278,7 +278,7 @@ pub struct NewStruct {

&[("TraitImpls::for_crate_", 1)],

expect_test::expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -314,11 +314,11 @@ $0",

&[("TraitImpls::for_crate_", 1)],

expect_test::expect![[r#"

[

- "source_root_crates_shim",

+ "source_root_crates",

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"TraitImpls::for_crate_",

"lang_items",

@@ -354,7 +354,7 @@ pub enum SomeEnum {

&[("TraitImpls::for_crate_", 1)],

expect_test::expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -390,11 +390,11 @@ $0",

&[("TraitImpls::for_crate_", 1)],

expect_test::expect![[r#"

[

- "source_root_crates_shim",

+ "source_root_crates",

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"TraitImpls::for_crate_",

"lang_items",

@@ -427,7 +427,7 @@ fn bar() -> f32 {

&[("TraitImpls::for_crate_", 1)],

expect_test::expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -467,11 +467,11 @@ $0",

&[("TraitImpls::for_crate_", 1)],

expect_test::expect![[r#"

[

- "source_root_crates_shim",

+ "source_root_crates",

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"TraitImpls::for_crate_",

"lang_items",

@@ -512,7 +512,7 @@ impl SomeStruct {

&[("TraitImpls::for_crate_", 1)],

expect_test::expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

@@ -568,11 +568,11 @@ fn main() {

&[("trait_solve_shim", 0)],

expect_test::expect![[r#"

[

- "source_root_crates_shim",

+ "source_root_crates",

"crate_local_def_map",

"file_item_tree_query",

"ast_id_map",

- "parse_shim",

+ "parse",

"real_span_map_shim",

"TraitItems::query_with_diagnostics_",

"Body::of_",

@@ -664,7 +664,7 @@ fn main() {

&[("trait_solve_shim", 0)],

expect_test::expect![[r#"

[

- "parse_shim",

+ "parse",

"ast_id_map",

"file_item_tree_query",

"real_span_map_shim",

diff --git a/crates/ide-db/src/test_data/test_doc_alias.txt b/crates/ide-db/src/test_data/test_doc_alias.txt
index fc98ebb069..17d002e8bf 100644
--- a/crates/ide-db/src/test_data/test_doc_alias.txt
+++ b/crates/ide-db/src/test_data/test_doc_alias.txt

@@ -2,7 +2,7 @@

(

Module {

id: ModuleIdLt {

- [salsa id]: Id(3400),

+ [salsa id]: Id(3000),

[

@@ -12,7 +12,7 @@

Struct(

Struct {

id: StructId(

- 3c01,

+ 3801,

@@ -20,7 +20,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -49,7 +49,7 @@

Struct(

Struct {

id: StructId(

- 3c00,

+ 3800,

@@ -57,7 +57,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -86,7 +86,7 @@

Struct(

Struct {

id: StructId(

- 3c00,

+ 3800,

@@ -94,7 +94,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -123,7 +123,7 @@

Struct(

Struct {

id: StructId(

- 3c00,

+ 3800,

@@ -131,7 +131,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -160,7 +160,7 @@

Struct(

Struct {

id: StructId(

- 3c00,

+ 3800,

@@ -168,7 +168,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -197,7 +197,7 @@

Struct(

Struct {

id: StructId(

- 3c01,

+ 3801,

@@ -205,7 +205,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -234,7 +234,7 @@

Struct(

Struct {

id: StructId(

- 3c00,

+ 3800,

@@ -242,7 +242,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

diff --git a/crates/ide-db/src/test_data/test_symbol_index_collection.txt b/crates/ide-db/src/test_data/test_symbol_index_collection.txt
index 02a023038a..1b20a574bd 100644
--- a/crates/ide-db/src/test_data/test_symbol_index_collection.txt
+++ b/crates/ide-db/src/test_data/test_symbol_index_collection.txt

@@ -2,7 +2,7 @@

(

Module {

id: ModuleIdLt {

- [salsa id]: Id(3400),

+ [salsa id]: Id(3000),

[

@@ -11,14 +11,14 @@

def: EnumVariant(

EnumVariant {

id: EnumVariantId(

- 7c00,

+ 7800,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -48,14 +48,14 @@

def: TypeAlias(

TypeAlias {

id: TypeAliasId(

- 7000,

+ 6c00,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -83,14 +83,14 @@

def: EnumVariant(

EnumVariant {

id: EnumVariantId(

- 7c01,

+ 7801,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -120,14 +120,14 @@

def: Const(

Const {

id: ConstId(

- 6800,

+ 6400,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -155,14 +155,14 @@

def: Const(

Const {

id: ConstId(

- 6802,

+ 6402,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -191,7 +191,7 @@

Enum(

Enum {

id: EnumId(

- 5400,

+ 5000,

@@ -199,7 +199,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -228,7 +228,7 @@

Macro {

id: Macro2Id(

Macro2Id(

- 5000,

+ 4c00,

@@ -236,7 +236,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -265,7 +265,7 @@

Macro {

id: Macro2Id(

Macro2Id(

- 5000,

+ 4c00,

@@ -273,7 +273,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -301,14 +301,14 @@

def: Static(

Static {

id: StaticId(

- 6c00,

+ 6800,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -337,7 +337,7 @@

Struct(

Struct {

id: StructId(

- 4c01,

+ 4801,

@@ -345,7 +345,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -374,7 +374,7 @@

Struct(

Struct {

id: StructId(

- 4c00,

+ 4800,

@@ -382,7 +382,7 @@

loc: DeclarationLocation {

hir_file_id: MacroFile(

MacroCallId(

- Id(4400),

+ Id(4000),

ptr: SyntaxNodePtr {

@@ -411,7 +411,7 @@

Struct(

Struct {

id: StructId(

- 4c05,

+ 4805,

@@ -419,7 +419,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -450,7 +450,7 @@

Struct(

Struct {

id: StructId(

- 4c06,

+ 4806,

@@ -458,7 +458,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -489,7 +489,7 @@

Struct(

Struct {

id: StructId(

- 4c07,

+ 4807,

@@ -497,7 +497,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -526,7 +526,7 @@

Struct(

Struct {

id: StructId(

- 4c02,

+ 4802,

@@ -534,7 +534,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -562,14 +562,14 @@

def: Trait(

Trait {

id: TraitId(

- 6000,

+ 5c00,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -598,7 +598,7 @@

Macro {

id: Macro2Id(

Macro2Id(

- 5000,

+ 4c00,

@@ -606,7 +606,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -635,7 +635,7 @@

Union(

Union {

id: UnionId(

- 5800,

+ 5400,

@@ -643,7 +643,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -671,14 +671,14 @@

def: Module(

Module {

id: ModuleIdLt {

- [salsa id]: Id(3401),

+ [salsa id]: Id(3001),

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -706,14 +706,14 @@

def: Module(

Module {

id: ModuleIdLt {

- [salsa id]: Id(3402),

+ [salsa id]: Id(3002),

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -742,7 +742,7 @@

Macro {

id: MacroRulesId(

MacroRulesId(

- 4001,

+ 3c01,

@@ -750,7 +750,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -778,14 +778,14 @@

def: Function(

FunctionId(

- 6402,

+ 6002,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -815,14 +815,14 @@

def: Function(

FunctionId(

- 6401,

+ 6001,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -853,7 +853,7 @@

Macro {

id: MacroRulesId(

MacroRulesId(

- 4000,

+ 3c00,

@@ -861,7 +861,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -889,14 +889,14 @@

def: Function(

FunctionId(

- 6400,

+ 6000,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -925,7 +925,7 @@

Macro {

id: MacroRulesId(

MacroRulesId(

- 4001,

+ 3c01,

@@ -933,7 +933,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -961,14 +961,14 @@

def: Function(

FunctionId(

- 6403,

+ 6003,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -998,7 +998,7 @@

(

Module {

id: ModuleIdLt {

- [salsa id]: Id(3401),

+ [salsa id]: Id(3001),

[

@@ -1008,7 +1008,7 @@

Struct(

Struct {

id: StructId(

- 4c03,

+ 4803,

@@ -1016,7 +1016,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

@@ -1044,7 +1044,7 @@

(

Module {

id: ModuleIdLt {

- [salsa id]: Id(3402),

+ [salsa id]: Id(3002),

[

@@ -1053,14 +1053,14 @@

def: Trait(

Trait {

id: TraitId(

- 6000,

+ 5c00,

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3001),

+ Id(2c01),

ptr: SyntaxNodePtr {

@@ -1089,7 +1089,7 @@

Macro {

id: Macro2Id(

Macro2Id(

- 5000,

+ 4c00,

@@ -1097,7 +1097,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3001),

+ Id(2c01),

ptr: SyntaxNodePtr {

@@ -1126,7 +1126,7 @@

Struct(

Struct {

id: StructId(

- 4c04,

+ 4804,

@@ -1134,7 +1134,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3001),

+ Id(2c01),

ptr: SyntaxNodePtr {

@@ -1163,7 +1163,7 @@

Macro {

id: Macro2Id(

Macro2Id(

- 5000,

+ 4c00,

@@ -1171,7 +1171,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3001),

+ Id(2c01),

ptr: SyntaxNodePtr {

@@ -1200,7 +1200,7 @@

Struct(

Struct {

id: StructId(

- 4c04,

+ 4804,

@@ -1208,7 +1208,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3001),

+ Id(2c01),

ptr: SyntaxNodePtr {

diff --git a/crates/ide-db/src/test_data/test_symbols_exclude_imports.txt b/crates/ide-db/src/test_data/test_symbols_exclude_imports.txt
index aff1d56c56..f8ae687b78 100644
--- a/crates/ide-db/src/test_data/test_symbols_exclude_imports.txt
+++ b/crates/ide-db/src/test_data/test_symbols_exclude_imports.txt

@@ -5,7 +5,7 @@

Struct(

Struct {

id: StructId(

- 4000,

+ 3c00,

@@ -13,7 +13,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3001),

+ Id(2c01),

ptr: SyntaxNodePtr {

diff --git a/crates/ide-db/src/test_data/test_symbols_with_imports.txt b/crates/ide-db/src/test_data/test_symbols_with_imports.txt
index bf5d81cfb1..2282815a61 100644
--- a/crates/ide-db/src/test_data/test_symbols_with_imports.txt
+++ b/crates/ide-db/src/test_data/test_symbols_with_imports.txt

@@ -5,7 +5,7 @@

Struct(

Struct {

id: StructId(

- 4000,

+ 3c00,

@@ -13,7 +13,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3001),

+ Id(2c01),

ptr: SyntaxNodePtr {

@@ -42,7 +42,7 @@

Struct(

Struct {

id: StructId(

- 4000,

+ 3c00,

@@ -50,7 +50,7 @@

loc: DeclarationLocation {

hir_file_id: FileId(

EditionedFileId(

- Id(3000),

+ Id(2c00),

ptr: SyntaxNodePtr {

diff --git a/crates/ide-diagnostics/src/handlers/unlinked_file.rs b/crates/ide-diagnostics/src/handlers/unlinked_file.rs
index a67c0ede56..d7a0a3b0f5 100644
--- a/crates/ide-diagnostics/src/handlers/unlinked_file.rs
+++ b/crates/ide-diagnostics/src/handlers/unlinked_file.rs

@@ -102,7 +102,7 @@ fn fixes(

// check crate roots, i.e. main.rs, lib.rs, ...

let relevant_crates = base_db::relevant_crates(db, file_id);

- 'crates: for &krate in &*relevant_crates {

+ 'crates: for &krate in relevant_crates {

// FIXME: This shouldnt need to access the crate def map directly

let crate_def_map = crate_def_map(ctx.sema.db, krate);

diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 776523cee7..f3e51e1919 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs

@@ -659,7 +659,7 @@ impl Analysis {

/// Returns crates that this file *might* belong to.

pub fn relevant_crates_for(&self, file_id: FileId) -> Cancellable<Vec<Crate>> {

- self.with_db(|db| relevant_crates(db, file_id).iter().copied().collect())

+ self.with_db(|db| relevant_crates(db, file_id).to_vec())

}

/// Returns the edition of the given crate.

diff --git a/crates/ide/src/signature_help.rs b/crates/ide/src/signature_help.rs
index 9eb01b12f2..cf796b2715 100644
--- a/crates/ide/src/signature_help.rs
+++ b/crates/ide/src/signature_help.rs

@@ -1975,8 +1975,8 @@ trait Sub: Super + Super {

fn f() -> impl Sub<$0

"#,

expect![[r#"

- trait Sub<SuperTy = …, SubTy = …>

- ^^^^^^^^^^^ ---------

+ trait Sub<SubTy = …, SuperTy = …>

+ ^^^^^^^^^ -----------

"#]],

);

}