Skip to content

Commit 2480c9e

Browse files
committed
Auto merge of #68305 - Dylan-DPC:rollup-aoohsz8, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #67956 (Detail transitive containment in E0588 diagnostic) - #68153 (resolve: Point at the private item definitions in privacy errors) - #68195 (Account for common `impl Trait`/`dyn Trait` return type errors) - #68288 (Fix some of the rustfmt fallout in Miri) - #68292 (don't clone types that are copy) - #68301 (Don't propagate __RUST_TEST_INVOKE to subprocess) Failed merges: r? @ghost
2 parents 91ff7c6 + 98347cd commit 2480c9e

File tree

121 files changed

+5522
-3442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+5522
-3442
lines changed

src/librustc/infer/error_reporting/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2008,7 +2008,7 @@ impl<'tcx> ObligationCause<'tcx> {
20082008
TypeError::IntrinsicCast => {
20092009
Error0308("cannot coerce intrinsics to function pointers")
20102010
}
2011-
TypeError::ObjectUnsafeCoercion(did) => Error0038(did.clone()),
2011+
TypeError::ObjectUnsafeCoercion(did) => Error0038(*did),
20122012
_ => Error0308("mismatched types"),
20132013
},
20142014
}

src/librustc/mir/interpret/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl ErrorHandled {
3333
ErrorHandled::Reported => {}
3434
ErrorHandled::TooGeneric => bug!(
3535
"MIR interpretation failed without reporting an error \
36-
even though it was fully monomorphized"
36+
even though it was fully monomorphized"
3737
),
3838
}
3939
}

src/librustc/mir/interpret/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,8 @@ impl<'tcx> AllocMap<'tcx> {
403403
let next = self.next_id;
404404
self.next_id.0 = self.next_id.0.checked_add(1).expect(
405405
"You overflowed a u64 by incrementing by 1... \
406-
You've just earned yourself a free drink if we ever meet. \
407-
Seriously, how did you do that?!",
406+
You've just earned yourself a free drink if we ever meet. \
407+
Seriously, how did you do that?!",
408408
);
409409
next
410410
}

0 commit comments

Comments
 (0)