diff options
| author | bors <bors@rust-lang.org> | 2022-09-07 13:27:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-07 13:27:46 +0000 |
| commit | ef3f649e49607a1fad64eb0a5139110df3efa2a7 (patch) | |
| tree | 9e0780e991c79932ecfe151ccea8c1e66d867a64 | |
| parent | b8a97c4b975a4d75cafc267c9bb20f26d8fae292 (diff) | |
| parent | f9ff70cef9c1bc5ad6c1592f6de73e3cdc10b579 (diff) | |
| download | rust-ef3f649e49607a1fad64eb0a5139110df3efa2a7.tar.gz rust-ef3f649e49607a1fad64eb0a5139110df3efa2a7.zip | |
Auto merge of #2535 - oli-obk:rustup, r=oli-obk
Rustup fix breakage in https://github.com/rust-lang/rust/pull/101522
| -rw-r--r-- | rust-version | 2 | ||||
| -rw-r--r-- | tests/fail/intrinsics/assume.rs | 2 | ||||
| -rw-r--r-- | tests/fail/intrinsics/assume.stderr | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/rust-version b/rust-version index 0c6d053e9b4..cbec52128d3 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -dec689432fac6720b2f18101ac28a21add98b1b8 +e7c7aa7288559f8e5ea7ce3543ff946b09783628 diff --git a/tests/fail/intrinsics/assume.rs b/tests/fail/intrinsics/assume.rs index be06d0a7a55..c34827427ef 100644 --- a/tests/fail/intrinsics/assume.rs +++ b/tests/fail/intrinsics/assume.rs @@ -5,6 +5,6 @@ fn main() { unsafe { std::intrinsics::assume(x < 10); std::intrinsics::assume(x > 1); - std::intrinsics::assume(x > 42); //~ ERROR: `assume` intrinsic called with `false` + std::intrinsics::assume(x > 42); //~ ERROR: `assume` called with `false` } } diff --git a/tests/fail/intrinsics/assume.stderr b/tests/fail/intrinsics/assume.stderr index 17e4cc6698d..c1909570d99 100644 --- a/tests/fail/intrinsics/assume.stderr +++ b/tests/fail/intrinsics/assume.stderr @@ -1,8 +1,8 @@ -error: Undefined Behavior: `assume` intrinsic called with `false` +error: Undefined Behavior: `assume` called with `false` --> $DIR/assume.rs:LL:CC | LL | std::intrinsics::assume(x > 42); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `assume` intrinsic called with `false` + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `assume` called with `false` | = help: this indicates a bug in the program: it performed an invalid operation, and caused Undefined Behavior = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information |