@@ -1459,7 +1459,7 @@ impl<'a> Resolver<'a> {
1459
1459
1460
1460
enum FindBindingResult < ' a > {
1461
1461
Binding ( Result < & ' a NameBinding < ' a > , Determinacy > ) ,
1462
- PathResult ( PathResult < ' a > ) ,
1462
+ Res ( Res ) ,
1463
1463
}
1464
1464
let find_binding_in_ns = |this : & mut Self , ns| {
1465
1465
let binding = if let Some ( module) = module {
@@ -1498,18 +1498,21 @@ impl<'a> Resolver<'a> {
1498
1498
Some ( LexicalScopeBinding :: Res ( res) )
1499
1499
if opt_ns == Some ( TypeNS ) || opt_ns == Some ( ValueNS ) =>
1500
1500
{
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) ;
1505
1502
}
1506
1503
_ => Err ( Determinacy :: determined ( finalize. is_some ( ) ) ) ,
1507
1504
}
1508
1505
} ;
1509
1506
FindBindingResult :: Binding ( binding)
1510
1507
} ;
1511
1508
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
+ }
1513
1516
FindBindingResult :: Binding ( binding) => binding,
1514
1517
} ;
1515
1518
match binding {
0 commit comments