Skip to content

Commit 68fa2a9

Browse files
borsbors
committed
Auto merge of #17405 - Veykril:modpath-clone, r=Veykril
internal: Don't unnecessarily clone ModPaths in early name res
2 parents 031d37f + 1a26a1f commit 68fa2a9

File tree

12 files changed

+29
-30
lines changed

12 files changed

+29
-30
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ impl ExprCollector<'_> {
965965
.resolve_path(
966966
self.db,
967967
module,
968-
&path,
968+
path,
969969
crate::item_scope::BuiltinShadowMode::Other,
970970
Some(MacroSubNs::Bang),
971971
)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -719,12 +719,12 @@ impl<'a> AssocItemCollector<'a> {
719719
let MacroCall { ast_id, expand_to, ctxt, ref path } = item_tree[call];
720720
let module = self.expander.module.local_id;
721721

722-
let resolver = |path| {
722+
let resolver = |path: &_| {
723723
self.def_map
724724
.resolve_path(
725725
self.db,
726726
module,
727-
&path,
727+
path,
728728
crate::item_scope::BuiltinShadowMode::Other,
729729
Some(MacroSubNs::Bang),
730730
)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl Expander {
5656
&mut self,
5757
db: &dyn DefDatabase,
5858
macro_call: ast::MacroCall,
59-
resolver: impl Fn(ModPath) -> Option<MacroId>,
59+
resolver: impl Fn(&ModPath) -> Option<MacroId>,
6060
) -> Result<ExpandResult<Option<(Mark, Parse<T>)>>, UnresolvedMacro> {
6161
// FIXME: within_limit should support this, instead of us having to extract the error
6262
let mut unresolved_macro_err = None;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,12 @@ impl GenericParamsCollector {
403403
let (def_map, expander) = &mut **exp;
404404

405405
let module = expander.module.local_id;
406-
let resolver = |path| {
406+
let resolver = |path: &_| {
407407
def_map
408408
.resolve_path(
409409
db,
410410
module,
411-
&path,
411+
path,
412412
crate::item_scope::BuiltinShadowMode::Other,
413413
Some(MacroSubNs::Bang),
414414
)

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ pub trait AsMacroCall {
13691369
&self,
13701370
db: &dyn ExpandDatabase,
13711371
krate: CrateId,
1372-
resolver: impl Fn(path::ModPath) -> Option<MacroDefId> + Copy,
1372+
resolver: impl Fn(&path::ModPath) -> Option<MacroDefId> + Copy,
13731373
) -> Option<MacroCallId> {
13741374
self.as_call_id_with_errors(db, krate, resolver).ok()?.value
13751375
}
@@ -1378,7 +1378,7 @@ pub trait AsMacroCall {
13781378
&self,
13791379
db: &dyn ExpandDatabase,
13801380
krate: CrateId,
1381-
resolver: impl Fn(path::ModPath) -> Option<MacroDefId> + Copy,
1381+
resolver: impl Fn(&path::ModPath) -> Option<MacroDefId> + Copy,
13821382
) -> Result<ExpandResult<Option<MacroCallId>>, UnresolvedMacro>;
13831383
}
13841384

@@ -1387,7 +1387,7 @@ impl AsMacroCall for InFile<&ast::MacroCall> {
13871387
&self,
13881388
db: &dyn ExpandDatabase,
13891389
krate: CrateId,
1390-
resolver: impl Fn(path::ModPath) -> Option<MacroDefId> + Copy,
1390+
resolver: impl Fn(&path::ModPath) -> Option<MacroDefId> + Copy,
13911391
) -> Result<ExpandResult<Option<MacroCallId>>, UnresolvedMacro> {
13921392
let expands_to = hir_expand::ExpandTo::from_call_site(self.value);
13931393
let ast_id = AstId::new(self.file_id, db.ast_id_map(self.file_id).ast_id(self.value));
@@ -1436,7 +1436,7 @@ fn macro_call_as_call_id(
14361436
call_site: SyntaxContextId,
14371437
expand_to: ExpandTo,
14381438
krate: CrateId,
1439-
resolver: impl Fn(path::ModPath) -> Option<MacroDefId> + Copy,
1439+
resolver: impl Fn(&path::ModPath) -> Option<MacroDefId> + Copy,
14401440
) -> Result<Option<MacroCallId>, UnresolvedMacro> {
14411441
macro_call_as_call_id_with_eager(db, call, call_site, expand_to, krate, resolver, resolver)
14421442
.map(|res| res.value)
@@ -1448,11 +1448,10 @@ fn macro_call_as_call_id_with_eager(
14481448
call_site: SyntaxContextId,
14491449
expand_to: ExpandTo,
14501450
krate: CrateId,
1451-
resolver: impl FnOnce(path::ModPath) -> Option<MacroDefId>,
1452-
eager_resolver: impl Fn(path::ModPath) -> Option<MacroDefId>,
1451+
resolver: impl FnOnce(&path::ModPath) -> Option<MacroDefId>,
1452+
eager_resolver: impl Fn(&path::ModPath) -> Option<MacroDefId>,
14531453
) -> Result<ExpandResult<Option<MacroCallId>>, UnresolvedMacro> {
1454-
let def =
1455-
resolver(call.path.clone()).ok_or_else(|| UnresolvedMacro { path: call.path.clone() })?;
1454+
let def = resolver(&call.path).ok_or_else(|| UnresolvedMacro { path: call.path.clone() })?;
14561455

14571456
let res = match def.kind {
14581457
MacroDefKind::BuiltInEager(..) => expand_eager_macro_input(

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ pub fn identity_when_valid(_attr: TokenStream, item: TokenStream) -> TokenStream
9696
let res = macro_call
9797
.as_call_id_with_errors(&db, krate, |path| {
9898
resolver
99-
.resolve_path_as_macro(&db, &path, Some(MacroSubNs::Bang))
99+
.resolve_path_as_macro(&db, path, Some(MacroSubNs::Bang))
100100
.map(|(it, _)| db.macro_def(it))
101101
})
102102
.unwrap();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,10 @@ pub(super) fn derive_macro_as_call_id(
137137
derive_pos: u32,
138138
call_site: SyntaxContextId,
139139
krate: CrateId,
140-
resolver: impl Fn(path::ModPath) -> Option<(MacroId, MacroDefId)>,
140+
resolver: impl Fn(&path::ModPath) -> Option<(MacroId, MacroDefId)>,
141141
derive_macro_id: MacroCallId,
142142
) -> Result<(MacroId, MacroDefId, MacroCallId), UnresolvedMacro> {
143-
let (macro_id, def_id) = resolver(item_attr.path.clone())
143+
let (macro_id, def_id) = resolver(&item_attr.path)
144144
.filter(|(_, def_id)| def_id.is_derive())
145145
.ok_or_else(|| UnresolvedMacro { path: item_attr.path.clone() })?;
146146
let call_id = def_id.make_call(

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1124,18 +1124,18 @@ impl DefCollector<'_> {
11241124
MacroSubNs::Attr
11251125
}
11261126
};
1127-
let resolver = |path| {
1127+
let resolver = |path: &_| {
11281128
let resolved_res = self.def_map.resolve_path_fp_with_macro(
11291129
self.db,
11301130
ResolveMode::Other,
11311131
directive.module_id,
1132-
&path,
1132+
path,
11331133
BuiltinShadowMode::Module,
11341134
Some(subns),
11351135
);
11361136
resolved_res.resolved_def.take_macros().map(|it| (it, self.db.macro_def(it)))
11371137
};
1138-
let resolver_def_id = |path| resolver(path).map(|(_, it)| it);
1138+
let resolver_def_id = |path: &_| resolver(path).map(|(_, it)| it);
11391139

11401140
match &directive.kind {
11411141
MacroDirectiveKind::FnLike { ast_id, expand_to, ctxt: call_site } => {
@@ -1238,7 +1238,7 @@ impl DefCollector<'_> {
12381238
}
12391239
}
12401240

1241-
let def = match resolver_def_id(path.clone()) {
1241+
let def = match resolver_def_id(path) {
12421242
Some(def) if def.is_attribute() => def,
12431243
_ => return Resolved::No,
12441244
};
@@ -1426,7 +1426,7 @@ impl DefCollector<'_> {
14261426
self.db,
14271427
ResolveMode::Other,
14281428
directive.module_id,
1429-
&path,
1429+
path,
14301430
BuiltinShadowMode::Module,
14311431
Some(MacroSubNs::Bang),
14321432
);
@@ -2314,7 +2314,7 @@ impl ModCollector<'_, '_> {
23142314
db,
23152315
ResolveMode::Other,
23162316
self.module_id,
2317-
&path,
2317+
path,
23182318
BuiltinShadowMode::Module,
23192319
Some(MacroSubNs::Bang),
23202320
);

‎src/tools/rust-analyzer/crates/hir-expand/src/eager.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub fn expand_eager_macro_input(
3939
ast_id: AstId<ast::MacroCall>,
4040
def: MacroDefId,
4141
call_site: SyntaxContextId,
42-
resolver: &dyn Fn(ModPath) -> Option<MacroDefId>,
42+
resolver: &dyn Fn(&ModPath) -> Option<MacroDefId>,
4343
) -> ExpandResult<Option<MacroCallId>> {
4444
let expand_to = ExpandTo::from_call_site(macro_call);
4545

@@ -138,7 +138,7 @@ fn eager_macro_recur(
138138
curr: InFile<SyntaxNode>,
139139
krate: CrateId,
140140
call_site: SyntaxContextId,
141-
macro_resolver: &dyn Fn(ModPath) -> Option<MacroDefId>,
141+
macro_resolver: &dyn Fn(&ModPath) -> Option<MacroDefId>,
142142
) -> ExpandResult<Option<(SyntaxNode, TextSize)>> {
143143
let original = curr.value.clone_for_update();
144144

@@ -172,7 +172,7 @@ fn eager_macro_recur(
172172
let def = match call.path().and_then(|path| {
173173
ModPath::from_src(db, path, &mut |range| span_map.span_at(range.start()).ctx)
174174
}) {
175-
Some(path) => match macro_resolver(path.clone()) {
175+
Some(path) => match macro_resolver(&path) {
176176
Some(def) => def,
177177
None => {
178178
error =

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,9 @@ impl<'a> TyLoweringContext<'a> {
416416
};
417417
let ty = {
418418
let macro_call = macro_call.to_node(self.db.upcast());
419-
let resolver = |path| {
419+
let resolver = |path: &_| {
420420
self.resolver
421-
.resolve_path_as_macro(self.db.upcast(), &path, Some(MacroSubNs::Bang))
421+
.resolve_path_as_macro(self.db.upcast(), path, Some(MacroSubNs::Bang))
422422
.map(|(it, _)| it)
423423
};
424424
match expander.enter_expand::<ast::Type>(self.db.upcast(), macro_call, resolver)

‎src/tools/rust-analyzer/crates/hir/src/semantics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ impl<'db> SemanticsImpl<'db> {
423423
let macro_call = InFile::new(file_id, actual_macro_call);
424424
let krate = resolver.krate();
425425
let macro_call_id = macro_call.as_call_id(self.db.upcast(), krate, |path| {
426-
resolver.resolve_path_as_macro_def(self.db.upcast(), &path, Some(MacroSubNs::Bang))
426+
resolver.resolve_path_as_macro_def(self.db.upcast(), path, Some(MacroSubNs::Bang))
427427
})?;
428428
hir_expand::db::expand_speculative(
429429
self.db.upcast(),

‎src/tools/rust-analyzer/crates/hir/src/source_analyzer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,7 @@ impl SourceAnalyzer {
826826
// FIXME: This causes us to parse, generally this is the wrong approach for resolving a
827827
// macro call to a macro call id!
828828
let macro_call_id = macro_call.as_call_id(db.upcast(), krate, |path| {
829-
self.resolver.resolve_path_as_macro_def(db.upcast(), &path, Some(MacroSubNs::Bang))
829+
self.resolver.resolve_path_as_macro_def(db.upcast(), path, Some(MacroSubNs::Bang))
830830
})?;
831831
// why the 64?
832832
Some(macro_call_id.as_macro_file()).filter(|it| it.expansion_level(db.upcast()) < 64)

0 commit comments

Comments
 (0)