diff options
| author | bors <bors@rust-lang.org> | 2020-11-24 12:27:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-24 12:27:30 +0000 |
| commit | 53d19b37c514246acab020eaba9527cb97c421cf (patch) | |
| tree | 657b3ff7ff74baa3b855bfee35724114b9fb2364 /compiler/rustc_interface/src | |
| parent | 6331023708aabef7fbd4ca502feb48c3afc83b41 (diff) | |
| parent | f049b0be9695cc87938436b50b982fc6013f8344 (diff) | |
| download | rust-53d19b37c514246acab020eaba9527cb97c421cf.tar.gz rust-53d19b37c514246acab020eaba9527cb97c421cf.zip | |
Auto merge of #79377 - jonas-schievink:rollup-ye81i66, r=jonas-schievink
Rollup of 10 pull requests Successful merges: - #76858 (Add exploit mitigations chapter to the rustc book) - #79310 (Make `fold_item_recur` non-nullable) - #79312 (Get rid of `doctree::Impl`) - #79321 (Accept '!' in intra-doc links) - #79346 (Allow using `-Z fewer-names=no` to retain value names) - #79351 (Fix typo in `keyword` docs for traits) - #79354 (BTreeMap: cut out the ceremony around BoxedNode) - #79358 (BTreeMap/BTreeSet: make public doc more consistent) - #79367 (Allow disabling TrapUnreachable via -Ztrap-unreachable=no) - #79374 (Add note to use nightly when using expr in const generics) Failed merges: 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 1fc2d281e79..92262050b8c 100644 --- a/compiler/rustc_interface/src/tests.rs +++ b/compiler/rustc_interface/src/tests.rs @@ -547,7 +547,7 @@ fn test_debugging_options_tracking_hash() { tracked!(debug_macros, true); tracked!(dep_info_omit_d_target, true); tracked!(dual_proc_macros, true); - tracked!(fewer_names, true); + tracked!(fewer_names, Some(true)); tracked!(force_overflow_checks, Some(true)); tracked!(force_unstable_if_unmarked, true); tracked!(fuel, Some(("abc".to_string(), 99))); @@ -592,6 +592,7 @@ fn test_debugging_options_tracking_hash() { tracked!(thinlto, Some(true)); tracked!(tune_cpu, Some(String::from("abc"))); tracked!(tls_model, Some(TlsModel::GeneralDynamic)); + tracked!(trap_unreachable, Some(false)); tracked!(treat_err_as_bug, Some(1)); tracked!(unleash_the_miri_inside_of_you, true); tracked!(use_ctors_section, Some(true)); |