Skip to content

Commit 9857e08

Browse files
committed
Auto merge of #151634 - matthiaskrgr:rollup-cE0JR24, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang/rust#145393 (Add codegen test for removing trailing zeroes from `NonZero`) - rust-lang/rust#148764 (ptr_aligment_type: add more APIs) - rust-lang/rust#149869 (std: avoid tearing `dbg!` prints) - rust-lang/rust#150065 (add CSE optimization tests for iterating over slice) - rust-lang/rust#150842 (Fix(lib/win/thread): Ensure `Sleep`'s usage passes over the requested duration under Win7) - rust-lang/rust#151505 (Various refactors to the proc_macro bridge) - rust-lang/rust#151560 (relnotes: fix 1.93's `as_mut_array` methods) - rust-lang/rust#151317 (x86 soft-float feature: mark it as forbidden rather than unstable) - rust-lang/rust#151577 (Rename `DepKindStruct` to `DepKindVTable`) - rust-lang/rust#151620 (Fix 'the the' typo in library/core/src/array/iter.rs)
2 parents 94bd57a + 64d2bea commit 9857e08

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

tests/fail/dangling_pointers/dangling_primitive.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ help: ALLOC was deallocated here:
1616
|
1717
LL | };
1818
| ^
19-
= note: this error originates in the macro `dbg` (in Nightly builds, run with -Z macro-backtrace for more info)
19+
= note: this error originates in the macro `$crate::macros::dbg_internal` which comes from the expansion of the macro `dbg` (in Nightly builds, run with -Z macro-backtrace for more info)
2020

2121
note: some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace
2222

tests/fail/function_calls/return_pointer_on_unwind.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | dbg!(x.0);
1111
|
1212
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
1313
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
14-
= note: this error originates in the macro `dbg` (in Nightly builds, run with -Z macro-backtrace for more info)
14+
= note: this error originates in the macro `$crate::macros::dbg_internal` which comes from the expansion of the macro `dbg` (in Nightly builds, run with -Z macro-backtrace for more info)
1515

1616
Uninitialized memory occurred at ALLOC[0x0..0x4], in this allocation:
1717
ALLOC (stack variable, size: 132, align: 4) {

0 commit comments

Comments
 (0)