diff options
| author | bors <bors@rust-lang.org> | 2022-04-20 18:40:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-20 18:40:13 +0000 |
| commit | 51ea9bb29b07d76c5a7167d054b54f4eb7f5b44e (patch) | |
| tree | 75e3c6812c9178f1f445e70a97a1d52c2f4292ae /src/test/codegen | |
| parent | 3e69bda8ce0367bfafdda66595a422c7637eb374 (diff) | |
| parent | 2443cf2c6a1b850c19e0de2b6fdc7f1ee250a7d0 (diff) | |
| download | rust-51ea9bb29b07d76c5a7167d054b54f4eb7f5b44e.tar.gz rust-51ea9bb29b07d76c5a7167d054b54f4eb7f5b44e.zip | |
Auto merge of #96253 - Dylan-DPC:rollup-87hpds5, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #93313 (Check if call return type is visibly uninhabited when building MIR) - #96160 (Miri/interpreter debugging tweaks) - #96167 (Replace sys/unix/weak AtomicUsize with AtomicPtr) - #96168 (Improve AddrParseError description) - #96206 (Use sys::unix::locks::futex* on wasm+atomics.) - #96234 (remove_dir_all_recursive: treat ELOOP the same as ENOTDIR) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/codegen')
| -rw-r--r-- | src/test/codegen/set-discriminant-invalid.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/codegen/set-discriminant-invalid.rs b/src/test/codegen/set-discriminant-invalid.rs index d9614f062b7..bccb9e4c758 100644 --- a/src/test/codegen/set-discriminant-invalid.rs +++ b/src/test/codegen/set-discriminant-invalid.rs @@ -28,7 +28,7 @@ impl IntoError<Error> for Api #[no_mangle] fn into_error(self, error: Self::Source) -> Error { Error::Api { - source: (|v| v)(error), + source: error, } } } |