Merge pull request #22133 from ChayimFriedman2/remove-more-arcs

internal: Remove more arcs

Author: ChayimFriedman2

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

@@ -9,7 +9,6 @@ use hir_expand::{
 };
 use span::SyntaxContext;
 use syntax::ast;
-use triomphe::Arc;
 
 use crate::{
     AstIdWithPath, MacroId, ModuleId, UnresolvedMacro,
@@ -126,7 +125,7 @@ pub(super) fn attr_macro_as_call_id(
         krate,
         MacroCallKind::Attr {
             ast_id: item_attr.ast_id,
-            attr_args: arg.map(Arc::new),
+            attr_args: arg.map(Box::new),
             censored_attr_ids,
         },
         macro_attr.ctxt,

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

@@ -227,7 +227,7 @@ pub struct S {}
                 "ast_id_map",
                 "parse",
                 "real_span_map",
-                "decl_macro_expander_shim",
+                "DeclarativeMacroExpander::expander_",
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse",
@@ -240,7 +240,7 @@ pub struct S {}
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse_macro_expansion",
-                "macro_arg_shim",
+                "macro_arg",
             ]
         "#]],
         expect![[r#"
@@ -249,7 +249,7 @@ pub struct S {}
                 "ast_id_map",
                 "file_item_tree_query",
                 "real_span_map",
-                "macro_arg_shim",
+                "macro_arg",
                 "parse_macro_expansion",
                 "ast_id_map",
                 "file_item_tree_query",
@@ -303,8 +303,8 @@ fn f() { foo }
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse_macro_expansion",
-                "expand_proc_macro_shim",
-                "macro_arg_shim",
+                "expand_proc_macro",
+                "macro_arg",
                 "proc_macro_span_shim",
             ]
         "#]],
@@ -314,8 +314,8 @@ fn f() { foo }
                 "ast_id_map",
                 "file_item_tree_query",
                 "real_span_map",
-                "macro_arg_shim",
-                "expand_proc_macro_shim",
+                "macro_arg",
+                "expand_proc_macro",
                 "parse_macro_expansion",
                 "ast_id_map",
                 "file_item_tree_query",
@@ -415,7 +415,7 @@ pub struct S {}
                 "ast_id_map",
                 "parse",
                 "real_span_map",
-                "decl_macro_expander_shim",
+                "DeclarativeMacroExpander::expander_",
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse",
@@ -428,19 +428,19 @@ pub struct S {}
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse_macro_expansion",
-                "macro_arg_shim",
-                "decl_macro_expander_shim",
+                "macro_arg",
+                "DeclarativeMacroExpander::expander_",
                 "macro_def_shim",
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse_macro_expansion",
-                "macro_arg_shim",
+                "macro_arg",
                 "macro_def_shim",
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse_macro_expansion",
-                "expand_proc_macro_shim",
-                "macro_arg_shim",
+                "expand_proc_macro",
+                "macro_arg",
                 "proc_macro_span_shim",
             ]
         "#]],
@@ -450,10 +450,10 @@ pub struct S {}
                 "ast_id_map",
                 "file_item_tree_query",
                 "real_span_map",
-                "macro_arg_shim",
-                "decl_macro_expander_shim",
-                "macro_arg_shim",
-                "macro_arg_shim",
+                "macro_arg",
+                "DeclarativeMacroExpander::expander_",
+                "macro_arg",
+                "macro_arg",
             ]
         "#]],
     );
@@ -526,7 +526,7 @@ m!(Z);
                 "ast_id_map",
                 "parse",
                 "real_span_map",
-                "decl_macro_expander_shim",
+                "DeclarativeMacroExpander::expander_",
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse",
@@ -539,15 +539,15 @@ m!(Z);
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse_macro_expansion",
-                "macro_arg_shim",
+                "macro_arg",
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse_macro_expansion",
-                "macro_arg_shim",
+                "macro_arg",
                 "file_item_tree_query",
                 "ast_id_map",
                 "parse_macro_expansion",
-                "macro_arg_shim",
+                "macro_arg",
             ]
         "#]],
     );
@@ -575,9 +575,9 @@ m!(Z);
                 "ast_id_map",
                 "file_item_tree_query",
                 "real_span_map",
-                "macro_arg_shim",
-                "macro_arg_shim",
-                "macro_arg_shim",
+                "macro_arg",
+                "macro_arg",
+                "macro_arg",
             ]
         "#]],
     );