Skip to content

Commit 9ece3bc

Browse files
ChayimFriedman2ChayimFriedman2
committed
Remove more Arcs
1 parent 8dcb776 commit 9ece3bc

25 files changed

Lines changed: 344 additions & 290 deletions

File tree

‎crates/hir-def/src/nameres/attr_resolution.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use hir_expand::{
99
};
1010
use span::SyntaxContext;
1111
use syntax::ast;
12-
use triomphe::Arc;
1312

1413
use crate::{
1514
AstIdWithPath, MacroId, ModuleId, UnresolvedMacro,
@@ -126,7 +125,7 @@ pub(super) fn attr_macro_as_call_id(
126125
krate,
127126
MacroCallKind::Attr {
128127
ast_id: item_attr.ast_id,
129-
attr_args: arg.map(Arc::new),
128+
attr_args: arg.map(Box::new),
130129
censored_attr_ids,
131130
},
132131
macro_attr.ctxt,

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ pub struct S {}
227227
"ast_id_map",
228228
"parse",
229229
"real_span_map",
230-
"decl_macro_expander_shim",
230+
"DeclarativeMacroExpander::expander_",
231231
"file_item_tree_query",
232232
"ast_id_map",
233233
"parse",
@@ -240,7 +240,7 @@ pub struct S {}
240240
"file_item_tree_query",
241241
"ast_id_map",
242242
"parse_macro_expansion",
243-
"macro_arg_shim",
243+
"macro_arg",
244244
]
245245
"#]],
246246
expect![[r#"
@@ -249,7 +249,7 @@ pub struct S {}
249249
"ast_id_map",
250250
"file_item_tree_query",
251251
"real_span_map",
252-
"macro_arg_shim",
252+
"macro_arg",
253253
"parse_macro_expansion",
254254
"ast_id_map",
255255
"file_item_tree_query",
@@ -303,8 +303,8 @@ fn f() { foo }
303303
"file_item_tree_query",
304304
"ast_id_map",
305305
"parse_macro_expansion",
306-
"expand_proc_macro_shim",
307-
"macro_arg_shim",
306+
"expand_proc_macro",
307+
"macro_arg",
308308
"proc_macro_span_shim",
309309
]
310310
"#]],
@@ -314,8 +314,8 @@ fn f() { foo }
314314
"ast_id_map",
315315
"file_item_tree_query",
316316
"real_span_map",
317-
"macro_arg_shim",
318-
"expand_proc_macro_shim",
317+
"macro_arg",
318+
"expand_proc_macro",
319319
"parse_macro_expansion",
320320
"ast_id_map",
321321
"file_item_tree_query",
@@ -415,7 +415,7 @@ pub struct S {}
415415
"ast_id_map",
416416
"parse",
417417
"real_span_map",
418-
"decl_macro_expander_shim",
418+
"DeclarativeMacroExpander::expander_",
419419
"file_item_tree_query",
420420
"ast_id_map",
421421
"parse",
@@ -428,19 +428,19 @@ pub struct S {}
428428
"file_item_tree_query",
429429
"ast_id_map",
430430
"parse_macro_expansion",
431-
"macro_arg_shim",
432-
"decl_macro_expander_shim",
431+
"macro_arg",
432+
"DeclarativeMacroExpander::expander_",
433433
"macro_def_shim",
434434
"file_item_tree_query",
435435
"ast_id_map",
436436
"parse_macro_expansion",
437-
"macro_arg_shim",
437+
"macro_arg",
438438
"macro_def_shim",
439439
"file_item_tree_query",
440440
"ast_id_map",
441441
"parse_macro_expansion",
442-
"expand_proc_macro_shim",
443-
"macro_arg_shim",
442+
"expand_proc_macro",
443+
"macro_arg",
444444
"proc_macro_span_shim",
445445
]
446446
"#]],
@@ -450,10 +450,10 @@ pub struct S {}
450450
"ast_id_map",
451451
"file_item_tree_query",
452452
"real_span_map",
453-
"macro_arg_shim",
454-
"decl_macro_expander_shim",
455-
"macro_arg_shim",
456-
"macro_arg_shim",
453+
"macro_arg",
454+
"DeclarativeMacroExpander::expander_",
455+
"macro_arg",
456+
"macro_arg",
457457
]
458458
"#]],
459459
);
@@ -526,7 +526,7 @@ m!(Z);
526526
"ast_id_map",
527527
"parse",
528528
"real_span_map",
529-
"decl_macro_expander_shim",
529+
"DeclarativeMacroExpander::expander_",
530530
"file_item_tree_query",
531531
"ast_id_map",
532532
"parse",
@@ -539,15 +539,15 @@ m!(Z);
539539
"file_item_tree_query",
540540
"ast_id_map",
541541
"parse_macro_expansion",
542-
"macro_arg_shim",
542+
"macro_arg",
543543
"file_item_tree_query",
544544
"ast_id_map",
545545
"parse_macro_expansion",
546-
"macro_arg_shim",
546+
"macro_arg",
547547
"file_item_tree_query",
548548
"ast_id_map",
549549
"parse_macro_expansion",
550-
"macro_arg_shim",
550+
"macro_arg",
551551
]
552552
"#]],
553553
);
@@ -575,9 +575,9 @@ m!(Z);
575575
"ast_id_map",
576576
"file_item_tree_query",
577577
"real_span_map",
578-
"macro_arg_shim",
579-
"macro_arg_shim",
580-
"macro_arg_shim",
578+
"macro_arg",
579+
"macro_arg",
580+
"macro_arg",
581581
]
582582
"#]],
583583
);

0 commit comments

Comments
 (0)