Skip to content

Commit

Permalink
Adapt test results
Browse files Browse the repository at this point in the history
  • Loading branch information
flba-eb committed Sep 22, 2022
1 parent 681f39b commit 676f62f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

#![deny(rust_2021_incompatible_closure_captures)]
//~^ NOTE: the lint level is defined here
// ignore-wasm32-bare compiled with panic=abort by default
#![feature(fn_traits)]
#![feature(never_type)]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: changes to closure capture in Rust 2021 will affect which traits the closure implements
--> $DIR/mir_calls_to_shims.rs:21:38
--> $DIR/mir_calls_to_shims.rs:20:38
|
LL | let result = panic::catch_unwind(move || {
| ^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/panic-handler/weak-lang-item.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0259]: the name `core` is defined multiple times
--> $DIR/weak-lang-item.rs:9:1
--> $DIR/weak-lang-item.rs:8:1
|
LL | extern crate core;
| ^^^^^^^^^^^^^^^^^^ `core` reimported here
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/unwind-abis/ffi-unwind-calls-lint.stderr
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 676f62f

Please sign in to comment.