Skip to content

Commit dc26876

Browse files
VeykrilVeykril
committed
Update fixtures
1 parent de0e00a commit dc26876

12 files changed

Lines changed: 151 additions & 152 deletions

File tree

‎src/tools/rust-analyzer/crates/base-db/src/lib.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,7 @@ pub fn set_all_crates_with_durability(
347347
///
348348
/// **Warning**: do not use this query in `hir-*` crates! It kills incrementality across crate metadata modifications.
349349
pub fn all_crates(db: &dyn salsa::Database) -> std::sync::Arc<[Crate]> {
350-
AllCrates::try_get(db)
351-
.map_or(std::sync::Arc::default(), |all_crates| all_crates.crates(db).into())
350+
AllCrates::try_get(db).map_or(std::sync::Arc::default(), |all_crates| all_crates.crates(db))
352351
}
353352

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

‎src/tools/rust-analyzer/crates/hir-def/src/expr_store/tests/body/block.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,13 @@ fn f() {
190190
"#,
191191
expect![[r#"
192192
ModuleIdLt {
193-
[salsa id]: Id(3803),
193+
[salsa id]: Id(3403),
194194
krate: Crate(
195-
Id(2400),
195+
Id(2000),
196196
),
197197
block: Some(
198198
BlockId(
199-
4801,
199+
4401,
200200
),
201201
),
202202
}"#]],

‎src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ macro_rules! f {
3535
};
3636
}
3737
38-
struct#0:MacroRules[BE8F, 0]@58..64#18432# MyTraitMap2#0:MacroCall[BE8F, 0]@31..42#ROOT2024# {#0:MacroRules[BE8F, 0]@72..73#18432#
39-
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#
40-
}#0:MacroRules[BE8F, 0]@132..133#18432#
38+
struct#0:MacroRules[BE8F, 0]@58..64#17408# MyTraitMap2#0:MacroCall[BE8F, 0]@31..42#ROOT2024# {#0:MacroRules[BE8F, 0]@72..73#17408#
39+
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#
40+
}#0:MacroRules[BE8F, 0]@132..133#17408#
4141
"#]],
4242
);
4343
}
@@ -197,7 +197,7 @@ macro_rules! mk_struct {
197197
#[macro_use]
198198
mod foo;
199199
200-
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#
200+
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#
201201
"#]],
202202
);
203203
}
@@ -423,10 +423,10 @@ m! { foo, bar }
423423
macro_rules! m {
424424
($($i:ident),*) => ( impl Bar { $(fn $i() {})* } );
425425
}
426-
impl#\18432# Bar#\18432# {#\18432#
427-
fn#\18432# foo#\ROOT2024#(#\18432#)#\18432# {#\18432#}#\18432#
428-
fn#\18432# bar#\ROOT2024#(#\18432#)#\18432# {#\18432#}#\18432#
429-
}#\18432#
426+
impl#\17408# Bar#\17408# {#\17408#
427+
fn#\17408# foo#\ROOT2024#(#\17408#)#\17408# {#\17408#}#\17408#
428+
fn#\17408# bar#\ROOT2024#(#\17408#)#\17408# {#\17408#}#\17408#
429+
}#\17408#
430430
"#]],
431431
);
432432
}

‎src/tools/rust-analyzer/crates/hir-def/src/nameres/tests/incremental.rs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -167,22 +167,22 @@ fn no() {}
167167
"crate_local_def_map",
168168
"file_item_tree_query",
169169
"ast_id_map",
170-
"parse_shim",
170+
"parse",
171171
"real_span_map_shim",
172172
"file_item_tree_query",
173173
"ast_id_map",
174-
"parse_shim",
174+
"parse",
175175
"real_span_map_shim",
176176
"file_item_tree_query",
177177
"ast_id_map",
178-
"parse_shim",
178+
"parse",
179179
"real_span_map_shim",
180180
"EnumVariants::of_",
181181
]
182182
"#]],
183183
expect![[r#"
184184
[
185-
"parse_shim",
185+
"parse",
186186
"ast_id_map",
187187
"file_item_tree_query",
188188
"real_span_map_shim",
@@ -225,16 +225,16 @@ pub struct S {}
225225
"crate_local_def_map",
226226
"file_item_tree_query",
227227
"ast_id_map",
228-
"parse_shim",
228+
"parse",
229229
"real_span_map_shim",
230230
"decl_macro_expander_shim",
231231
"file_item_tree_query",
232232
"ast_id_map",
233-
"parse_shim",
233+
"parse",
234234
"real_span_map_shim",
235235
"file_item_tree_query",
236236
"ast_id_map",
237-
"parse_shim",
237+
"parse",
238238
"real_span_map_shim",
239239
"macro_def_shim",
240240
"file_item_tree_query",
@@ -245,7 +245,7 @@ pub struct S {}
245245
"#]],
246246
expect![[r#"
247247
[
248-
"parse_shim",
248+
"parse",
249249
"ast_id_map",
250250
"file_item_tree_query",
251251
"real_span_map_shim",
@@ -283,21 +283,21 @@ fn f() { foo }
283283
"crate_local_def_map",
284284
"file_item_tree_query",
285285
"ast_id_map",
286-
"parse_shim",
286+
"parse",
287287
"real_span_map_shim",
288288
"crate_local_def_map",
289289
"proc_macros_for_crate_shim",
290290
"file_item_tree_query",
291291
"ast_id_map",
292-
"parse_shim",
292+
"parse",
293293
"real_span_map_shim",
294294
"file_item_tree_query",
295295
"ast_id_map",
296-
"parse_shim",
296+
"parse",
297297
"real_span_map_shim",
298298
"file_item_tree_query",
299299
"ast_id_map",
300-
"parse_shim",
300+
"parse",
301301
"real_span_map_shim",
302302
"macro_def_shim",
303303
"file_item_tree_query",
@@ -310,7 +310,7 @@ fn f() { foo }
310310
"#]],
311311
expect![[r#"
312312
[
313-
"parse_shim",
313+
"parse",
314314
"ast_id_map",
315315
"file_item_tree_query",
316316
"real_span_map_shim",
@@ -407,22 +407,22 @@ pub struct S {}
407407
"crate_local_def_map",
408408
"file_item_tree_query",
409409
"ast_id_map",
410-
"parse_shim",
410+
"parse",
411411
"real_span_map_shim",
412412
"crate_local_def_map",
413413
"proc_macros_for_crate_shim",
414414
"file_item_tree_query",
415415
"ast_id_map",
416-
"parse_shim",
416+
"parse",
417417
"real_span_map_shim",
418418
"decl_macro_expander_shim",
419419
"file_item_tree_query",
420420
"ast_id_map",
421-
"parse_shim",
421+
"parse",
422422
"real_span_map_shim",
423423
"file_item_tree_query",
424424
"ast_id_map",
425-
"parse_shim",
425+
"parse",
426426
"real_span_map_shim",
427427
"macro_def_shim",
428428
"file_item_tree_query",
@@ -446,7 +446,7 @@ pub struct S {}
446446
"#]],
447447
expect![[r#"
448448
[
449-
"parse_shim",
449+
"parse",
450450
"ast_id_map",
451451
"file_item_tree_query",
452452
"real_span_map_shim",
@@ -524,16 +524,16 @@ m!(Z);
524524
"crate_local_def_map",
525525
"file_item_tree_query",
526526
"ast_id_map",
527-
"parse_shim",
527+
"parse",
528528
"real_span_map_shim",
529529
"decl_macro_expander_shim",
530530
"file_item_tree_query",
531531
"ast_id_map",
532-
"parse_shim",
532+
"parse",
533533
"real_span_map_shim",
534534
"file_item_tree_query",
535535
"ast_id_map",
536-
"parse_shim",
536+
"parse",
537537
"real_span_map_shim",
538538
"macro_def_shim",
539539
"file_item_tree_query",
@@ -571,7 +571,7 @@ m!(Z);
571571
&[("file_item_tree_query", 1), ("parse_macro_expansion_shim", 0)],
572572
expect![[r#"
573573
[
574-
"parse_shim",
574+
"parse",
575575
"ast_id_map",
576576
"file_item_tree_query",
577577
"real_span_map_shim",
@@ -611,7 +611,7 @@ pub type Ty = ();
611611
[
612612
"file_item_tree_query",
613613
"ast_id_map",
614-
"parse_shim",
614+
"parse",
615615
"real_span_map_shim",
616616
]
617617
"#]],
@@ -629,7 +629,7 @@ pub type Ty = ();
629629
&[("file_item_tree_query", 1), ("parse", 1)],
630630
expect![[r#"
631631
[
632-
"parse_shim",
632+
"parse",
633633
"ast_id_map",
634634
"file_item_tree_query",
635635
"real_span_map_shim",

‎src/tools/rust-analyzer/crates/hir-ty/src/tests/incremental.rs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ fn foo() -> i32 {
3131
&[("InferenceResult::for_body_", 1)],
3232
expect_test::expect![[r#"
3333
[
34-
"source_root_crates_shim",
34+
"source_root_crates",
3535
"crate_local_def_map",
3636
"file_item_tree_query",
3737
"ast_id_map",
38-
"parse_shim",
38+
"parse",
3939
"real_span_map_shim",
4040
"InferenceResult::for_body_",
4141
"FunctionSignature::of_",
@@ -76,7 +76,7 @@ fn foo() -> i32 {
7676
&[("InferenceResult::for_body_", 0)],
7777
expect_test::expect![[r#"
7878
[
79-
"parse_shim",
79+
"parse",
8080
"ast_id_map",
8181
"file_item_tree_query",
8282
"real_span_map_shim",
@@ -119,11 +119,11 @@ fn baz() -> i32 {
119119
&[("InferenceResult::for_body_", 3)],
120120
expect_test::expect![[r#"
121121
[
122-
"source_root_crates_shim",
122+
"source_root_crates",
123123
"crate_local_def_map",
124124
"file_item_tree_query",
125125
"ast_id_map",
126-
"parse_shim",
126+
"parse",
127127
"real_span_map_shim",
128128
"InferenceResult::for_body_",
129129
"FunctionSignature::of_",
@@ -189,7 +189,7 @@ fn baz() -> i32 {
189189
&[("InferenceResult::for_body_", 1)],
190190
expect_test::expect![[r#"
191191
[
192-
"parse_shim",
192+
"parse",
193193
"ast_id_map",
194194
"file_item_tree_query",
195195
"real_span_map_shim",
@@ -239,11 +239,11 @@ $0",
239239
&[("TraitImpls::for_crate_", 1)],
240240
expect_test::expect![[r#"
241241
[
242-
"source_root_crates_shim",
242+
"source_root_crates",
243243
"crate_local_def_map",
244244
"file_item_tree_query",
245245
"ast_id_map",
246-
"parse_shim",
246+
"parse",
247247
"real_span_map_shim",
248248
"TraitImpls::for_crate_",
249249
"lang_items",
@@ -278,7 +278,7 @@ pub struct NewStruct {
278278
&[("TraitImpls::for_crate_", 1)],
279279
expect_test::expect![[r#"
280280
[
281-
"parse_shim",
281+
"parse",
282282
"ast_id_map",
283283
"file_item_tree_query",
284284
"real_span_map_shim",
@@ -314,11 +314,11 @@ $0",
314314
&[("TraitImpls::for_crate_", 1)],
315315
expect_test::expect![[r#"
316316
[
317-
"source_root_crates_shim",
317+
"source_root_crates",
318318
"crate_local_def_map",
319319
"file_item_tree_query",
320320
"ast_id_map",
321-
"parse_shim",
321+
"parse",
322322
"real_span_map_shim",
323323
"TraitImpls::for_crate_",
324324
"lang_items",
@@ -354,7 +354,7 @@ pub enum SomeEnum {
354354
&[("TraitImpls::for_crate_", 1)],
355355
expect_test::expect![[r#"
356356
[
357-
"parse_shim",
357+
"parse",
358358
"ast_id_map",
359359
"file_item_tree_query",
360360
"real_span_map_shim",
@@ -390,11 +390,11 @@ $0",
390390
&[("TraitImpls::for_crate_", 1)],
391391
expect_test::expect![[r#"
392392
[
393-
"source_root_crates_shim",
393+
"source_root_crates",
394394
"crate_local_def_map",
395395
"file_item_tree_query",
396396
"ast_id_map",
397-
"parse_shim",
397+
"parse",
398398
"real_span_map_shim",
399399
"TraitImpls::for_crate_",
400400
"lang_items",
@@ -427,7 +427,7 @@ fn bar() -> f32 {
427427
&[("TraitImpls::for_crate_", 1)],
428428
expect_test::expect![[r#"
429429
[
430-
"parse_shim",
430+
"parse",
431431
"ast_id_map",
432432
"file_item_tree_query",
433433
"real_span_map_shim",
@@ -467,11 +467,11 @@ $0",
467467
&[("TraitImpls::for_crate_", 1)],
468468
expect_test::expect![[r#"
469469
[
470-
"source_root_crates_shim",
470+
"source_root_crates",
471471
"crate_local_def_map",
472472
"file_item_tree_query",
473473
"ast_id_map",
474-
"parse_shim",
474+
"parse",
475475
"real_span_map_shim",
476476
"TraitImpls::for_crate_",
477477
"lang_items",
@@ -512,7 +512,7 @@ impl SomeStruct {
512512
&[("TraitImpls::for_crate_", 1)],
513513
expect_test::expect![[r#"
514514
[
515-
"parse_shim",
515+
"parse",
516516
"ast_id_map",
517517
"file_item_tree_query",
518518
"real_span_map_shim",
@@ -568,11 +568,11 @@ fn main() {
568568
&[("trait_solve_shim", 0)],
569569
expect_test::expect![[r#"
570570
[
571-
"source_root_crates_shim",
571+
"source_root_crates",
572572
"crate_local_def_map",
573573
"file_item_tree_query",
574574
"ast_id_map",
575-
"parse_shim",
575+
"parse",
576576
"real_span_map_shim",
577577
"TraitItems::query_with_diagnostics_",
578578
"Body::of_",
@@ -664,7 +664,7 @@ fn main() {
664664
&[("trait_solve_shim", 0)],
665665
expect_test::expect![[r#"
666666
[
667-
"parse_shim",
667+
"parse",
668668
"ast_id_map",
669669
"file_item_tree_query",
670670
"real_span_map_shim",

0 commit comments

Comments
 (0)