diff options
| author | bors <bors@rust-lang.org> | 2025-01-07 04:35:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-07 04:35:05 +0000 |
| commit | 6f2ca607bc03f526c3c88ba300a713609a8bdab0 (patch) | |
| tree | f29fea52b49a62955a8a6ed39c80c8fbfc152a98 /compiler/rustc_interface/src | |
| parent | 0f1e965fec3bc2f97b932e9dd8e85fca6d7faadc (diff) | |
| parent | ee55b347c90b002abf3f89d3fb599941278b5946 (diff) | |
| download | rust-6f2ca607bc03f526c3c88ba300a713609a8bdab0.tar.gz rust-6f2ca607bc03f526c3c88ba300a713609a8bdab0.zip | |
Auto merge of #135183 - jhpratt:rollup-qwg4pm0, r=jhpratt
Rollup of 9 pull requests Successful merges: - #131830 (Add support for wasm exception handling to Emscripten target) - #132345 (Improve diagnostics for `HostEffectPredicate` in the new solver) - #134568 (Release notes for 1.84.0) - #134744 (Don't ice on bad transmute in typeck in new solver) - #135090 (Suggest to replace tuple constructor through projection) - #135116 (rustdoc: Fix mismatched capitalization in sidebar) - #135126 (mark deprecated option as deprecated in rustc_session to remove copypasta and small refactor) - #135139 ([generic_assert] Constify methods used by the formatting system) - #135170 (Update triagebot.toml: celinval vacation is over) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_interface/src')
| -rw-r--r-- | compiler/rustc_interface/src/tests.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs index 9ad69039914..53d7c84ac3f 100644 --- a/compiler/rustc_interface/src/tests.rs +++ b/compiler/rustc_interface/src/tests.rs @@ -582,6 +582,7 @@ fn test_codegen_options_tracking_hash() { untracked!(dlltool, Some(PathBuf::from("custom_dlltool.exe"))); untracked!(extra_filename, String::from("extra-filename")); untracked!(incremental, Some(String::from("abc"))); + untracked!(inline_threshold, Some(0xf007ba11)); // `link_arg` is omitted because it just forwards to `link_args`. untracked!(link_args, vec![String::from("abc"), String::from("def")]); untracked!(link_self_contained, LinkSelfContained::on()); @@ -613,7 +614,6 @@ fn test_codegen_options_tracking_hash() { tracked!(embed_bitcode, false); tracked!(force_frame_pointers, FramePointer::Always); tracked!(force_unwind_tables, Some(true)); - tracked!(inline_threshold, Some(0xf007ba11)); tracked!(instrument_coverage, InstrumentCoverage::Yes); tracked!(link_dead_code, Some(true)); tracked!(linker_plugin_lto, LinkerPluginLto::LinkerPluginAuto); @@ -782,6 +782,7 @@ fn test_unstable_options_tracking_hash() { tracked!(dwarf_version, Some(5)); tracked!(embed_source, true); tracked!(emit_thin_lto, false); + tracked!(emscripten_wasm_eh, true); tracked!(export_executable_symbols, true); tracked!(fewer_names, Some(true)); tracked!(fixed_x18, true); |