diff options
| author | bors <bors@rust-lang.org> | 2023-04-25 04:58:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-25 04:58:54 +0000 |
| commit | ed3ddb375bf18099a885605efba94dc1e50379d7 (patch) | |
| tree | 66afe302b8efddeef9f8a787ab8c97f1e7d74102 /compiler/rustc_interface/src | |
| parent | f6830a212973ced91a047cee86cb79cee4f23868 (diff) | |
| parent | 2d72abc8f24d0af3b0344cbee14130eaaf90f75f (diff) | |
| download | rust-ed3ddb375bf18099a885605efba94dc1e50379d7.tar.gz rust-ed3ddb375bf18099a885605efba94dc1e50379d7.zip | |
Auto merge of #110789 - matthiaskrgr:rollup-92e764u, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #110563 (Break up long function in trait selection error reporting + clean up nearby code)
- #110755 ([LLVM17] Adapt to `ExplicitEmulatedTLS` removal.)
- #110775 (Update books)
- #110779 (configure.py: add flag for riscv{64,32}gc musl-root)
- #110782 (Revert panic oom)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs index ce0f90bc1cc..7b0b5102c2d 100644 --- a/compiler/rustc_interface/src/tests.rs +++ b/compiler/rustc_interface/src/tests.rs @@ -777,7 +777,7 @@ fn test_unstable_options_tracking_hash() { tracked!(no_link, true); tracked!(no_profiler_runtime, true); tracked!(no_unique_section_names, true); - tracked!(oom, OomStrategy::Unwind); + tracked!(oom, OomStrategy::Panic); tracked!(osx_rpath_install_name, true); tracked!(packed_bundled_libs, true); tracked!(panic_abort_tests, true); |