Skip to content

Commit 4e21a5a

Browse files
VeykrilVeykril
committed
internal: Don't unnecessarily clone ModPaths out of interning wrappers
1 parent 1a26a1f commit 4e21a5a

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

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

14091410
macro_call_as_call_id_with_eager(
14101411
db,
1411-
&AstIdWithPath::new(ast_id.file_id, ast_id.value, path),
1412+
ast_id,
1413+
&path,
14121414
call_site.ctx,
14131415
expands_to,
14141416
krate,
@@ -1422,11 +1424,15 @@ impl AsMacroCall for InFile<&ast::MacroCall> {
14221424
#[derive(Clone, Debug, Eq, PartialEq)]
14231425
struct AstIdWithPath<T: AstIdNode> {
14241426
ast_id: AstId<T>,
1425-
path: path::ModPath,
1427+
path: Interned<path::ModPath>,
14261428
}
14271429

14281430
impl<T: AstIdNode> AstIdWithPath<T> {
1429-
fn new(file_id: HirFileId, ast_id: FileAstId<T>, path: path::ModPath) -> AstIdWithPath<T> {
1431+
fn new(
1432+
file_id: HirFileId,
1433+
ast_id: FileAstId<T>,
1434+
path: Interned<path::ModPath>,
1435+
) -> AstIdWithPath<T> {
14301436
AstIdWithPath { ast_id: AstId::new(file_id, ast_id), path }
14311437
}
14321438
}
@@ -1439,27 +1445,37 @@ fn macro_call_as_call_id(
14391445
krate: CrateId,
14401446
resolver: impl Fn(&path::ModPath) -> Option<MacroDefId> + Copy,
14411447
) -> Result<Option<MacroCallId>, UnresolvedMacro> {
1442-
macro_call_as_call_id_with_eager(db, call, call_site, expand_to, krate, resolver, resolver)
1443-
.map(|res| res.value)
1448+
macro_call_as_call_id_with_eager(
1449+
db,
1450+
call.ast_id,
1451+
&call.path,
1452+
call_site,
1453+
expand_to,
1454+
krate,
1455+
resolver,
1456+
resolver,
1457+
)
1458+
.map(|res| res.value)
14441459
}
14451460

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

14571473
let res = match def.kind {
14581474
MacroDefKind::BuiltInEager(..) => expand_eager_macro_input(
14591475
db,
14601476
krate,
1461-
&call.ast_id.to_node(db),
1462-
call.ast_id,
1477+
&ast_id.to_node(db),
1478+
ast_id,
14631479
def,
14641480
call_site,
14651481
&|path| eager_resolver(path).filter(MacroDefId::is_fn_like),
@@ -1468,12 +1484,12 @@ fn macro_call_as_call_id_with_eager(
14681484
value: Some(def.make_call(
14691485
db,
14701486
krate,
1471-
MacroCallKind::FnLike { ast_id: call.ast_id, expand_to, eager: None },
1487+
MacroCallKind::FnLike { ast_id, expand_to, eager: None },
14721488
call_site,
14731489
)),
14741490
err: None,
14751491
},
1476-
_ => return Err(UnresolvedMacro { path: call.path.clone() }),
1492+
_ => return Err(UnresolvedMacro { path: path.clone() }),
14771493
};
14781494
Ok(res)
14791495
}

‎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;
@@ -1300,7 +1301,11 @@ impl DefCollector<'_> {
13001301
let call_id = call_id();
13011302
let mut len = 0;
13021303
for (idx, (path, call_site)) in derive_macros.enumerate() {
1303-
let ast_id = AstIdWithPath::new(file_id, ast_id.value, path);
1304+
let ast_id = AstIdWithPath::new(
1305+
file_id,
1306+
ast_id.value,
1307+
Interned::new(path),
1308+
);
13041309
self.unresolved_macros.push(MacroDirective {
13051310
module_id: directive.module_id,
13061311
depth: directive.depth + 1,
@@ -1473,7 +1478,7 @@ impl DefCollector<'_> {
14731478
derive_index: *derive_pos as u32,
14741479
derive_macro_id: *derive_macro_id,
14751480
},
1476-
ast_id.path.clone(),
1481+
ast_id.path.as_ref().clone(),
14771482
));
14781483
}
14791484
// These are diagnosed by `reseed_with_unresolved_attribute`, as that function consumes them
@@ -2108,7 +2113,7 @@ impl ModCollector<'_, '_> {
21082113
let ast_id = AstIdWithPath::new(
21092114
self.file_id(),
21102115
mod_item.ast_id(self.item_tree),
2111-
attr.path.as_ref().clone(),
2116+
attr.path.clone(),
21122117
);
21132118
self.def_collector.unresolved_macros.push(MacroDirective {
21142119
module_id: self.module_id,
@@ -2302,7 +2307,7 @@ impl ModCollector<'_, '_> {
23022307
&MacroCall { ref path, ast_id, expand_to, ctxt }: &MacroCall,
23032308
container: ItemContainerId,
23042309
) {
2305-
let ast_id = AstIdWithPath::new(self.file_id(), ast_id, ModPath::clone(path));
2310+
let ast_id = AstIdWithPath::new(self.file_id(), ast_id, path.clone());
23062311
let db = self.def_collector.db;
23072312

23082313
// FIXME: Immediately expanding in "Case 1" is insufficient since "Case 2" may also define
@@ -2312,7 +2317,8 @@ impl ModCollector<'_, '_> {
23122317
// Case 1: try to resolve macro calls with single-segment name and expand macro_rules
23132318
if let Ok(res) = macro_call_as_call_id_with_eager(
23142319
db.upcast(),
2315-
&ast_id,
2320+
ast_id.ast_id,
2321+
&ast_id.path,
23162322
ctxt,
23172323
expand_to,
23182324
self.def_collector.def_map.krate,

0 commit comments

Comments
 (0)