Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

resolve: Remove force parameter from resolve_ident_in_scope

Browse Source
This commit is contained in:
Vadim Petrochenkov
2026-01-30 19:29:00 +03:00
parent e823167aa6
commit ea0ee492bd
6 changed files with 10 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_resolve/src/diagnostics.rs
-3
View File
@@ -1709,7 +1709,6 @@ pub(crate) fn unresolved_macro_suggestions(
ScopeSet::All(ns),
parent_scope,
None,
false,
None,
None,
) else {
@@ -2546,7 +2545,6 @@ pub(crate) fn report_path_resolution_error(
ScopeSet::All(ns_to_try),
parent_scope,
None,
false,
ignore_decl,
ignore_import,
)
@@ -2650,7 +2648,6 @@ pub(crate) fn report_path_resolution_error(
ScopeSet::All(ValueNS),
parent_scope,
None,
false,
ignore_decl,
ignore_import,
) {
compiler/rustc_resolve/src/ident.rs
+6 -28
View File
@@ -350,7 +350,6 @@ pub(crate) fn resolve_ident_in_lexical_scope(
ScopeSet::Module(ns, module),
parent_scope,
finalize.map(|finalize| Finalize { used: Used::Scope, ..finalize }),
finalize.is_some(),
ignore_decl,
None,
)
@@ -368,7 +367,6 @@ pub(crate) fn resolve_ident_in_lexical_scope(
ScopeSet::All(ns),
parent_scope,
finalize,
finalize.is_some(),
ignore_decl,
None,
)
@@ -396,12 +394,9 @@ pub(crate) fn resolve_ident_in_scope_set<'r>(
scope_set: ScopeSet<'ra>,
parent_scope: &ParentScope<'ra>,
finalize: Option<Finalize>,
force: bool,
ignore_decl: Option<Decl<'ra>>,
ignore_import: Option<Import<'ra>>,
) -> Result<Decl<'ra>, Determinacy> {
assert!(force || finalize.is_none()); // `finalize` implies `force`
// Make sure `self`, `super` etc produce an error when passed to here.
if !matches!(scope_set, ScopeSet::Module(..)) && orig_ident.is_path_segment_keyword() {
return Err(Determinacy::Determined);
@@ -451,7 +446,6 @@ pub(crate) fn resolve_ident_in_scope_set<'r>(
parent_scope,
// Shadowed decls don't need to be marked as used or non-speculatively loaded.
if innermost_results.is_empty() { finalize } else { None },
force,
ignore_decl,
ignore_import,
) {
@@ -509,7 +503,7 @@ pub(crate) fn resolve_ident_in_scope_set<'r>(
// Scope visiting walked all the scopes and maybe found something in one of them.
match innermost_results.first() {
Some(&(decl, ..)) => Ok(decl),
None => Err(Determinacy::determined(determinacy == Determinacy::Determined || force)),
None => Err(determinacy),
}
}
@@ -523,7 +517,6 @@ fn resolve_ident_in_scope<'r>(
scope_set: ScopeSet<'ra>,
parent_scope: &ParentScope<'ra>,
finalize: Option<Finalize>,
force: bool,
ignore_decl: Option<Decl<'ra>>,
ignore_import: Option<Import<'ra>>,
) -> Result<Decl<'ra>, ControlFlow<Determinacy, Determinacy>> {
@@ -546,7 +539,7 @@ fn resolve_ident_in_scope<'r>(
match self.reborrow().resolve_derive_macro_path(
derive,
parent_scope,
force,
false,
ignore_import,
) {
Ok((Some(ext), _)) => {
@@ -617,11 +610,7 @@ fn resolve_ident_in_scope<'r>(
Ok(decl)
}
Err(ControlFlow::Continue(determinacy)) => Err(determinacy),
Err(ControlFlow::Break(determinacy)) => {
return Err(ControlFlow::Break(Determinacy::determined(
determinacy == Determinacy::Determined || force,
)));
}
Err(ControlFlow::Break(..)) => return decl,
}
}
Scope::ModuleGlobs(module, derive_fallback_lint_id) => {
@@ -668,11 +657,7 @@ fn resolve_ident_in_scope<'r>(
Ok(binding)
}
Err(ControlFlow::Continue(determinacy)) => Err(determinacy),
Err(ControlFlow::Break(determinacy)) => {
return Err(ControlFlow::Break(Determinacy::determined(
determinacy == Determinacy::Determined || force,
)));
}
Err(ControlFlow::Break(..)) => return binding,
}
}
Scope::MacroUsePrelude => match self.macro_use_prelude.get(&ident.name).cloned() {
@@ -715,7 +700,6 @@ fn resolve_ident_in_scope<'r>(
ScopeSet::Module(ns, prelude),
parent_scope,
None,
false,
ignore_decl,
ignore_import,
)
@@ -951,7 +935,6 @@ fn resolve_ident_in_virt_module_unadjusted<'r>(
ScopeSet::Module(ns, module),
parent_scope,
finalize,
finalize.is_some(),
ignore_decl,
ignore_import,
),
@@ -960,7 +943,6 @@ fn resolve_ident_in_virt_module_unadjusted<'r>(
ScopeSet::ModuleAndExternPrelude(ns, module),
parent_scope,
finalize,
finalize.is_some(),
ignore_decl,
ignore_import,
),
@@ -973,7 +955,6 @@ fn resolve_ident_in_virt_module_unadjusted<'r>(
ScopeSet::ExternPrelude,
parent_scope,
finalize,
finalize.is_some(),
ignore_decl,
ignore_import,
)
@@ -996,7 +977,6 @@ fn resolve_ident_in_virt_module_unadjusted<'r>(
ScopeSet::All(ns),
parent_scope,
finalize,
finalize.is_some(),
ignore_decl,
ignore_import,
)
@@ -1180,7 +1160,6 @@ fn resolve_ident_in_module_globs_unadjusted<'r>(
ScopeSet::Module(ns, module),
adjusted_parent_scope,
None,
false,
ignore_decl,
ignore_import,
);
@@ -1881,7 +1860,6 @@ fn record_segment_res<'r, 'ra, 'tcx>(
ScopeSet::All(ns),
parent_scope,
finalize,
finalize.is_some(),
ignore_decl,
ignore_import,
)
@@ -1957,8 +1935,8 @@ fn record_segment_res<'r, 'ra, 'tcx>(
);
}
}
Err(Undetermined) => return PathResult::Indeterminate,
Err(Determined) => {
Err(Undetermined) if finalize.is_none() => return PathResult::Indeterminate,
Err(Determined | Undetermined) => {
if let Some(ModuleOrUniformRoot::Module(module)) = module
&& opt_ns.is_some()
&& !module.is_normal()
compiler/rustc_resolve/src/imports.rs
-1
View File
@@ -1498,7 +1498,6 @@ pub(crate) fn check_for_redundant_imports(&mut self, import: Import<'ra>) -> boo
ScopeSet::All(ns),
&import.parent_scope,
None,
false,
decls[ns].get().decl(),
None,
) {
compiler/rustc_resolve/src/macros.rs
+3 -4
View File
@@ -799,10 +799,12 @@ fn resolve_macro_or_delegation_path<'r>(
ScopeSet::Macro(kind),
parent_scope,
None,
force,
None,
None,
);
let binding = binding.map_err(|determinacy| {
Determinacy::determined(determinacy == Determinacy::Determined || force)
});
if let Err(Determinacy::Undetermined) = binding {
return Err(Determinacy::Undetermined);
}
@@ -958,7 +960,6 @@ pub(crate) fn finalize_macro_resolutions(&mut self, krate: &Crate) {
ScopeSet::Macro(kind),
&parent_scope,
Some(Finalize::new(ast::CRATE_NODE_ID, ident.span)),
true,
None,
None,
) {
@@ -1013,7 +1014,6 @@ pub(crate) fn finalize_macro_resolutions(&mut self, krate: &Crate) {
ScopeSet::Macro(MacroKind::Attr),
&parent_scope,
Some(Finalize::new(ast::CRATE_NODE_ID, ident.span)),
true,
None,
None,
);
@@ -1117,7 +1117,6 @@ fn report_out_of_scope_macro_calls<'r>(
ScopeSet::Macro(MacroKind::Bang),
&ParentScope { macro_rules: no_macro_rules, ..*parent_scope },
None,
false,
None,
None,
);
tests/ui/macros/macro-rules-as-derive-or-attr-issue-132928.rs
-1
View File
@@ -5,5 +5,4 @@ macro_rules! sample { () => {} }
#[sample] //~ ERROR cannot find attribute `sample` in this scope
#[derive(sample)] //~ ERROR cannot find derive macro `sample` in this scope
//~| ERROR cannot find derive macro `sample` in this scope
//~| ERROR cannot find derive macro `sample` in this scope
pub struct S {}
tests/ui/macros/macro-rules-as-derive-or-attr-issue-132928.stderr
+1 -12
View File
@@ -1,12 +1,3 @@
error: cannot find derive macro `sample` in this scope
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:6:10
|
LL | macro_rules! sample { () => {} }
| ------ `sample` exists, but has no `derive` rules
...
LL | #[derive(sample)]
| ^^^^^^
error: cannot find attribute `sample` in this scope
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:5:3
|
@@ -24,8 +15,6 @@ LL | macro_rules! sample { () => {} }
...
LL | #[derive(sample)]
| ^^^^^^
|
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
error: cannot find derive macro `sample` in this scope
--> $DIR/macro-rules-as-derive-or-attr-issue-132928.rs:6:10
@@ -38,5 +27,5 @@ LL | #[derive(sample)]
|
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
error: aborting due to 4 previous errors
error: aborting due to 3 previous errors