bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Do not record Res when builing a suggestion.

Browse source
This commit is contained in:
Camille GILLOT 2022-04-08 22:51:27 +02:00
parent 55ca03c0ac
commit 3ee6f6e28a
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_resolve/src/ident.rs
View file

@ -1459,7 +1459,7 @@ impl<'a> Resolver<'a> {
enum FindBindingResult<'a> { enum FindBindingResult<'a> {
Binding(Result<&'a NameBinding<'a>, Determinacy>), Binding(Result<&'a NameBinding<'a>, Determinacy>),
PathResult(PathResult<'a>), Res(Res),
} }
let find_binding_in_ns = |this: &mut Self, ns| { let find_binding_in_ns = |this: &mut Self, ns| {
let binding = if let Some(module) = module { let binding = if let Some(module) = module {
@ -1498,10 +1498,7 @@ impl<'a> Resolver<'a> {
Some(LexicalScopeBinding::Res(res)) Some(LexicalScopeBinding::Res(res))
if opt_ns == Some(TypeNS) || opt_ns == Some(ValueNS) => if opt_ns == Some(TypeNS) || opt_ns == Some(ValueNS) =>
{ {
record_segment_res(this, res); return FindBindingResult::Res(res);
return FindBindingResult::PathResult(PathResult::NonModule(
PartialRes::with_unresolved_segments(res, path.len() - 1),
));
} }
_ => Err(Determinacy::determined(finalize.is_some())), _ => Err(Determinacy::determined(finalize.is_some())),
} }
@ -1509,7 +1506,13 @@ impl<'a> Resolver<'a> {
FindBindingResult::Binding(binding) FindBindingResult::Binding(binding)
}; };
let binding = match find_binding_in_ns(self, ns) { let binding = match find_binding_in_ns(self, ns) {
FindBindingResult::PathResult(x) => return x, FindBindingResult::Res(res) => {
record_segment_res(self, res);
return PathResult::NonModule(PartialRes::with_unresolved_segments(
res,
path.len() - 1,
));
}
FindBindingResult::Binding(binding) => binding, FindBindingResult::Binding(binding) => binding,
}; };
match binding { match binding {