Skip to content

Commit 51ea7e8

Browse files
borsbors
committed
Auto merge of #17406 - Veykril:modpath-clone, r=Veykril
internal: Don't unnecessarily clone ModPaths out of interning wrappers
2 parents 68fa2a9 + 4e21a5a commit 51ea7e8

File tree

4 files changed

+41
-19
lines changed

4 files changed

+41
-19
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ impl<'a> AssocItemCollector<'a> {
628628
'attrs: for attr in &*attrs {
629629
let ast_id =
630630
AstId::new(self.expander.current_file_id(), item.ast_id(item_tree).upcast());
631-
let ast_id_with_path = AstIdWithPath { path: (*attr.path).clone(), ast_id };
631+
let ast_id_with_path = AstIdWithPath { path: attr.path.clone(), ast_id };
632632

633633
match self.def_map.resolve_attr_macro(
634634
self.db,

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

+27-11
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ pub mod find_path;
5656
pub mod import_map;
5757
pub mod visibility;
5858

59+
use intern::Interned;
5960
pub use rustc_abi as layout;
6061
use triomphe::Arc;
6162

@@ -1407,7 +1408,8 @@ impl AsMacroCall for InFile<&ast::MacroCall> {
14071408

14081409
macro_call_as_call_id_with_eager(
14091410
db,
1410-
&AstIdWithPath::new(ast_id.file_id, ast_id.value, path),
1411+
ast_id,
1412+
&path,
14111413
call_site.ctx,
14121414
expands_to,
14131415
krate,
@@ -1421,11 +1423,15 @@ impl AsMacroCall for InFile<&ast::MacroCall> {
14211423
#[derive(Clone, Debug, Eq, PartialEq)]
14221424
struct AstIdWithPath<T: AstIdNode> {
14231425
ast_id: AstId<T>,
1424-
path: path::ModPath,
1426+
path: Interned<path::ModPath>,
14251427
}
14261428

14271429
impl<T: AstIdNode> AstIdWithPath<T> {
1428-
fn new(file_id: HirFileId, ast_id: FileAstId<T>, path: path::ModPath) -> AstIdWithPath<T> {
1430+
fn new(
1431+
file_id: HirFileId,
1432+
ast_id: FileAstId<T>,
1433+
path: Interned<path::ModPath>,
1434+
) -> AstIdWithPath<T> {
14291435
AstIdWithPath { ast_id: AstId::new(file_id, ast_id), path }
14301436
}
14311437
}
@@ -1438,27 +1444,37 @@ fn macro_call_as_call_id(
14381444
krate: CrateId,
14391445
resolver: impl Fn(&path::ModPath) -> Option<MacroDefId> + Copy,
14401446
) -> Result<Option<MacroCallId>, UnresolvedMacro> {
1441-
macro_call_as_call_id_with_eager(db, call, call_site, expand_to, krate, resolver, resolver)
1442-
.map(|res| res.value)
1447+
macro_call_as_call_id_with_eager(
1448+
db,
1449+
call.ast_id,
1450+
&call.path,
1451+
call_site,
1452+
expand_to,
1453+
krate,
1454+
resolver,
1455+
resolver,
1456+
)
1457+
.map(|res| res.value)
14431458
}
14441459

14451460
fn macro_call_as_call_id_with_eager(
14461461
db: &dyn ExpandDatabase,
1447-
call: &AstIdWithPath<ast::MacroCall>,
1462+
ast_id: AstId<ast::MacroCall>,
1463+
path: &path::ModPath,
14481464
call_site: SyntaxContextId,
14491465
expand_to: ExpandTo,
14501466
krate: CrateId,
14511467
resolver: impl FnOnce(&path::ModPath) -> Option<MacroDefId>,
14521468
eager_resolver: impl Fn(&path::ModPath) -> Option<MacroDefId>,
14531469
) -> Result<ExpandResult<Option<MacroCallId>>, UnresolvedMacro> {
1454-
let def = resolver(&call.path).ok_or_else(|| UnresolvedMacro { path: call.path.clone() })?;
1470+
let def = resolver(path).ok_or_else(|| UnresolvedMacro { path: path.clone() })?;
14551471

14561472
let res = match def.kind {
14571473
MacroDefKind::BuiltInEager(..) => expand_eager_macro_input(
14581474
db,
14591475
krate,
1460-
&call.ast_id.to_node(db),
1461-
call.ast_id,
1476+
&ast_id.to_node(db),
1477+
ast_id,
14621478
def,
14631479
call_site,
14641480
&|path| eager_resolver(path).filter(MacroDefId::is_fn_like),
@@ -1467,12 +1483,12 @@ fn macro_call_as_call_id_with_eager(
14671483
value: Some(def.make_call(
14681484
db,
14691485
krate,
1470-
MacroCallKind::FnLike { ast_id: call.ast_id, expand_to, eager: None },
1486+
MacroCallKind::FnLike { ast_id, expand_to, eager: None },
14711487
call_site,
14721488
)),
14731489
err: None,
14741490
},
1475-
_ => return Err(UnresolvedMacro { path: call.path.clone() }),
1491+
_ => return Err(UnresolvedMacro { path: path.clone() }),
14761492
};
14771493
Ok(res)
14781494
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl DefMap {
5959
return Ok(ResolvedAttr::Other);
6060
}
6161
}
62-
None => return Err(UnresolvedMacro { path: ast_id.path }),
62+
None => return Err(UnresolvedMacro { path: ast_id.path.as_ref().clone() }),
6363
};
6464

6565
Ok(ResolvedAttr::Macro(attr_macro_as_call_id(
@@ -142,7 +142,7 @@ pub(super) fn derive_macro_as_call_id(
142142
) -> Result<(MacroId, MacroDefId, MacroCallId), UnresolvedMacro> {
143143
let (macro_id, def_id) = resolver(&item_attr.path)
144144
.filter(|(_, def_id)| def_id.is_derive())
145-
.ok_or_else(|| UnresolvedMacro { path: item_attr.path.clone() })?;
145+
.ok_or_else(|| UnresolvedMacro { path: item_attr.path.as_ref().clone() })?;
146146
let call_id = def_id.make_call(
147147
db.upcast(),
148148
krate,

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

+11-5
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use hir_expand::{
1717
proc_macro::CustomProcMacroExpander,
1818
ExpandTo, HirFileId, InFile, MacroCallId, MacroCallKind, MacroDefId, MacroDefKind,
1919
};
20+
use intern::Interned;
2021
use itertools::{izip, Itertools};
2122
use la_arena::Idx;
2223
use limit::Limit;
@@ -1287,7 +1288,11 @@ impl DefCollector<'_> {
12871288
let call_id = call_id();
12881289
let mut len = 0;
12891290
for (idx, (path, call_site)) in derive_macros.enumerate() {
1290-
let ast_id = AstIdWithPath::new(file_id, ast_id.value, path);
1291+
let ast_id = AstIdWithPath::new(
1292+
file_id,
1293+
ast_id.value,
1294+
Interned::new(path),
1295+
);
12911296
self.unresolved_macros.push(MacroDirective {
12921297
module_id: directive.module_id,
12931298
depth: directive.depth + 1,
@@ -1460,7 +1465,7 @@ impl DefCollector<'_> {
14601465
derive_index: *derive_pos as u32,
14611466
derive_macro_id: *derive_macro_id,
14621467
},
1463-
ast_id.path.clone(),
1468+
ast_id.path.as_ref().clone(),
14641469
));
14651470
}
14661471
// These are diagnosed by `reseed_with_unresolved_attribute`, as that function consumes them
@@ -2095,7 +2100,7 @@ impl ModCollector<'_, '_> {
20952100
let ast_id = AstIdWithPath::new(
20962101
self.file_id(),
20972102
mod_item.ast_id(self.item_tree),
2098-
attr.path.as_ref().clone(),
2103+
attr.path.clone(),
20992104
);
21002105
self.def_collector.unresolved_macros.push(MacroDirective {
21012106
module_id: self.module_id,
@@ -2277,7 +2282,7 @@ impl ModCollector<'_, '_> {
22772282
&MacroCall { ref path, ast_id, expand_to, ctxt }: &MacroCall,
22782283
container: ItemContainerId,
22792284
) {
2280-
let ast_id = AstIdWithPath::new(self.file_id(), ast_id, ModPath::clone(path));
2285+
let ast_id = AstIdWithPath::new(self.file_id(), ast_id, path.clone());
22812286
let db = self.def_collector.db;
22822287

22832288
// FIXME: Immediately expanding in "Case 1" is insufficient since "Case 2" may also define
@@ -2287,7 +2292,8 @@ impl ModCollector<'_, '_> {
22872292
// Case 1: try to resolve macro calls with single-segment name and expand macro_rules
22882293
if let Ok(res) = macro_call_as_call_id_with_eager(
22892294
db.upcast(),
2290-
&ast_id,
2295+
ast_id.ast_id,
2296+
&ast_id.path,
22912297
ctxt,
22922298
expand_to,
22932299
self.def_collector.def_map.krate,

0 commit comments

Comments
 (0)