diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:11:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:12:43 +0000 |
| commit | cf94bdc0742c13e2a0cac864c478b8626b266e1b (patch) | |
| tree | 044670aa50cc5e2b4229aa0b6b3df6676730c0a6 /src/test/ui/unwind-abis | |
| parent | Adding debian version 1.65.0+dfsg1-2. (diff) | |
| download | rustc-cf94bdc0742c13e2a0cac864c478b8626b266e1b.tar.xz rustc-cf94bdc0742c13e2a0cac864c478b8626b266e1b.zip | |
Merging upstream version 1.66.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | src/test/ui/unwind-abis/feature-gate-c-unwind.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/unwind-abis/ffi-unwind-calls-lint.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/unwind-abis/ffi-unwind-calls-lint.stderr | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/test/ui/unwind-abis/feature-gate-c-unwind.stderr b/src/test/ui/unwind-abis/feature-gate-c-unwind.stderr index a67f46cd2..214ddc45c 100644 --- a/src/test/ui/unwind-abis/feature-gate-c-unwind.stderr +++ b/src/test/ui/unwind-abis/feature-gate-c-unwind.stderr @@ -4,10 +4,10 @@ warning: unknown lint: `ffi_unwind_calls` LL | #![allow(ffi_unwind_calls)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ | - = note: `#[warn(unknown_lints)]` on by default = note: the `ffi_unwind_calls` lint is unstable = note: see issue #74990 <https://github.com/rust-lang/rust/issues/74990> for more information = help: add `#![feature(c_unwind)]` to the crate attributes to enable + = note: `#[warn(unknown_lints)]` on by default error[E0658]: C-unwind ABI is experimental and subject to change --> $DIR/feature-gate-c-unwind.rs:8:8 diff --git a/src/test/ui/unwind-abis/ffi-unwind-calls-lint.rs b/src/test/ui/unwind-abis/ffi-unwind-calls-lint.rs index dadf4b121..9a324f004 100644 --- a/src/test/ui/unwind-abis/ffi-unwind-calls-lint.rs +++ b/src/test/ui/unwind-abis/ffi-unwind-calls-lint.rs @@ -1,6 +1,5 @@ // build-pass // needs-unwind -// ignore-wasm32-bare compiled with panic=abort by default #![feature(c_unwind)] #![warn(ffi_unwind_calls)] diff --git a/src/test/ui/unwind-abis/ffi-unwind-calls-lint.stderr b/src/test/ui/unwind-abis/ffi-unwind-calls-lint.stderr index ed41cb746..937a2b3df 100644 --- a/src/test/ui/unwind-abis/ffi-unwind-calls-lint.stderr +++ b/src/test/ui/unwind-abis/ffi-unwind-calls-lint.stderr @@ -1,17 +1,17 @@ warning: call to foreign function with FFI-unwind ABI - --> $DIR/ffi-unwind-calls-lint.rs:21:14 + --> $DIR/ffi-unwind-calls-lint.rs:20:14 | LL | unsafe { foo(); } | ^^^^^ call to foreign function with FFI-unwind ABI | note: the lint level is defined here - --> $DIR/ffi-unwind-calls-lint.rs:6:9 + --> $DIR/ffi-unwind-calls-lint.rs:5:9 | LL | #![warn(ffi_unwind_calls)] | ^^^^^^^^^^^^^^^^ warning: call to function pointer with FFI-unwind ABI - --> $DIR/ffi-unwind-calls-lint.rs:25:5 + --> $DIR/ffi-unwind-calls-lint.rs:24:5 | LL | ptr(); | ^^^^^ call to function pointer with FFI-unwind ABI |