Skip to content

Commit 3ee6f6e

Browse files
committed
Do not record Res when builing a suggestion.
1 parent 55ca03c commit 3ee6f6e

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

compiler/rustc_resolve/src/ident.rs

+9-6
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,7 @@ impl<'a> Resolver<'a> {
14591459

14601460
enum FindBindingResult<'a> {
14611461
Binding(Result<&'a NameBinding<'a>, Determinacy>),
1462-
PathResult(PathResult<'a>),
1462+
Res(Res),
14631463
}
14641464
let find_binding_in_ns = |this: &mut Self, ns| {
14651465
let binding = if let Some(module) = module {
@@ -1498,18 +1498,21 @@ impl<'a> Resolver<'a> {
14981498
Some(LexicalScopeBinding::Res(res))
14991499
if opt_ns == Some(TypeNS) || opt_ns == Some(ValueNS) =>
15001500
{
1501-
record_segment_res(this, res);
1502-
return FindBindingResult::PathResult(PathResult::NonModule(
1503-
PartialRes::with_unresolved_segments(res, path.len() - 1),
1504-
));
1501+
return FindBindingResult::Res(res);
15051502
}
15061503
_ => Err(Determinacy::determined(finalize.is_some())),
15071504
}
15081505
};
15091506
FindBindingResult::Binding(binding)
15101507
};
15111508
let binding = match find_binding_in_ns(self, ns) {
1512-
FindBindingResult::PathResult(x) => return x,
1509+
FindBindingResult::Res(res) => {
1510+
record_segment_res(self, res);
1511+
return PathResult::NonModule(PartialRes::with_unresolved_segments(
1512+
res,
1513+
path.len() - 1,
1514+
));
1515+
}
15131516
FindBindingResult::Binding(binding) => binding,
15141517
};
15151518
match binding {

0 commit comments

Comments
 (0)