File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed
rustc_data_structures/src
rustc_trait_selection/src/traits/select Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change 1
1
use std:: alloc:: Allocator ;
2
- use std:: marker:: PointeeSized ;
3
2
#[ cfg( not( bootstrap) ) ]
4
3
use std:: marker:: Move ;
4
+ use std:: marker:: PointeeSized ;
5
5
6
6
#[ diagnostic:: on_unimplemented( message = "`{Self}` doesn't implement `DynSend`. \
7
7
Add it to `rustc_data_structures::marker` or use `IntoDynSyncSend` if it's already `Send`") ]
Original file line number Diff line number Diff line change @@ -1506,7 +1506,6 @@ unsafe impl DynSync for TyCtxt<'_> {}
1506
1506
fn _assert_tcx_fields ( ) {
1507
1507
sync:: assert_dyn_sync :: < & ' _ GlobalCtxt < ' _ > > ( ) ;
1508
1508
sync:: assert_dyn_send :: < & ' _ GlobalCtxt < ' _ > > ( ) ;
1509
-
1510
1509
}
1511
1510
1512
1511
impl < ' tcx > Deref for TyCtxt < ' tcx > {
Original file line number Diff line number Diff line change @@ -1888,14 +1888,15 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
1888
1888
// Need to prefer alias-bound over env candidates.
1889
1889
let alias_bound = candidates
1890
1890
. iter ( )
1891
- . filter_map ( |c| if let ProjectionCandidate ( i) = c. candidate { Some ( i) } else { None } )
1891
+ . filter_map (
1892
+ |c| if let ProjectionCandidate ( i) = c. candidate { Some ( i) } else { None } ,
1893
+ )
1892
1894
. try_reduce ( |c1, c2| if has_non_region_infer { None } else { Some ( c1. min ( c2) ) } ) ;
1893
1895
match alias_bound {
1894
1896
Some ( Some ( index) ) => return Some ( ProjectionCandidate ( index) ) ,
1895
1897
Some ( None ) => { }
1896
1898
None => return None ,
1897
1899
}
1898
-
1899
1900
}
1900
1901
1901
1902
// The next highest priority is for non-global where-bounds. However, while we don't
You can’t perform that action at this time.
0 commit comments