Skip to content

Commit f257881

Browse files
committed
fmt
1 parent 9a38230 commit f257881

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

compiler/rustc_data_structures/src/marker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::alloc::Allocator;
2-
use std::marker::PointeeSized;
32
#[cfg(not(bootstrap))]
43
use std::marker::Move;
4+
use std::marker::PointeeSized;
55

66
#[diagnostic::on_unimplemented(message = "`{Self}` doesn't implement `DynSend`. \
77
Add it to `rustc_data_structures::marker` or use `IntoDynSyncSend` if it's already `Send`")]

compiler/rustc_middle/src/ty/context.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1506,7 +1506,6 @@ unsafe impl DynSync for TyCtxt<'_> {}
15061506
fn _assert_tcx_fields() {
15071507
sync::assert_dyn_sync::<&'_ GlobalCtxt<'_>>();
15081508
sync::assert_dyn_send::<&'_ GlobalCtxt<'_>>();
1509-
15101509
}
15111510

15121511
impl<'tcx> Deref for TyCtxt<'tcx> {

compiler/rustc_trait_selection/src/traits/select/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,14 +1888,15 @@ impl<'tcx> SelectionContext<'_, 'tcx> {
18881888
// Need to prefer alias-bound over env candidates.
18891889
let alias_bound = candidates
18901890
.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+
)
18921894
.try_reduce(|c1, c2| if has_non_region_infer { None } else { Some(c1.min(c2)) });
18931895
match alias_bound {
18941896
Some(Some(index)) => return Some(ProjectionCandidate(index)),
18951897
Some(None) => {}
18961898
None => return None,
18971899
}
1898-
18991900
}
19001901

19011902
// The next highest priority is for non-global where-bounds. However, while we don't

0 commit comments

Comments
 (0)