Skip to content

Commit 73f6e0b

Browse files
committed
Auto merge of #151716 - Zalathar:rollup-kd2N5CM, r=Zalathar
Rollup of 12 pull requests Successful merges: - rust-lang/rust#147996 (Stabilize ppc inline assembly) - rust-lang/rust#148718 (Do not mention `-Zmacro-backtrace` for std macros that are a wrapper around a compiler intrinsic) - rust-lang/rust#151137 (checksum-freshness: Fix invalid checksum calculation for binary files) - rust-lang/rust#151680 (Update backtrace and windows-bindgen) - rust-lang/rust#150863 (Adds two new Tier 3 targets - `aarch64v8r-unknown-none{,-softfloat}`) - rust-lang/rust#151040 (Don't expose redundant information in `rustc_public`'s `LayoutShape`) - rust-lang/rust#151383 (remove `#[deprecated]` from unstable & internal `SipHasher13` and `24` types) - rust-lang/rust#151529 (lint: Use rustc_apfloat for `overflowing_literals`, add f16 and f128) - rust-lang/rust#151669 (rename uN::{gather,scatter}_bits to uN::{extract,deposit}_bits) - rust-lang/rust#151689 (Fix broken Xtensa installation link) - rust-lang/rust#151699 (Update books) - rust-lang/rust#151700 (os allow missing_docs)
2 parents b65e669 + 8ba45ef commit 73f6e0b

15 files changed

Lines changed: 0 additions & 17 deletions

tests/fail-dep/concurrency/windows_join_main.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ LL | | assert_eq!(WaitForSingleObject(MAIN_THREAD, INFINITE), WAIT_O
3131
LL | | }
3232
LL | | })
3333
| |______^
34-
= note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
3534

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

tests/fail/dangling_pointers/dangling_primitive.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ help: ALLOC was deallocated here:
1616
|
1717
LL | };
1818
| ^
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)
2019

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

tests/fail/dangling_pointers/out_of_bounds_read.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ help: ALLOC was allocated here:
1111
|
1212
LL | let v: Vec<u16> = vec![1, 2];
1313
| ^^^^^^^^^^
14-
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
1514

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

tests/fail/dangling_pointers/out_of_bounds_read_neg_offset.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ help: ALLOC was allocated here:
1111
|
1212
LL | let v: Vec<u16> = vec![1, 2];
1313
| ^^^^^^^^^^
14-
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
1514

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

tests/fail/dangling_pointers/out_of_bounds_write.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ help: ALLOC was allocated here:
1111
|
1212
LL | let mut v: Vec<u16> = vec![1, 2];
1313
| ^^^^^^^^^^
14-
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
1514

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

tests/fail/erroneous_const2.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ note: erroneous constant encountered
2323
|
2424
LL | println!("{}", FOO);
2525
| ^^^
26-
|
27-
= note: this note originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
2826

2927
error: aborting due to 1 previous error
3028

tests/fail/function_calls/return_pointer_on_unwind.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ 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 `$crate::macros::dbg_internal` which comes from the expansion of the macro `dbg` (in Nightly builds, run with -Z macro-backtrace for more info)
1514

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

tests/fail/intrinsics/simd-scatter.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ help: ALLOC was allocated here:
1616
|
1717
LL | let mut vec: Vec<i8> = vec![10, 11, 12, 13, 14, 15, 16, 17, 18];
1818
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
19-
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
2019

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

tests/fail/provenance/mix-ptrs1.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LL | assert_eq!(*strange_ptr.with_addr(ptr.addr()), 0);
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
9-
= note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
109

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

tests/fail/provenance/mix-ptrs2.stderr

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LL | assert_eq!(*ptr, 42);
66
|
77
= help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior
88
= help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
9-
= note: this error originates in the macro `assert_eq` (in Nightly builds, run with -Z macro-backtrace for more info)
109

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

0 commit comments

Comments
 (0)