nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 10:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test that non_default_option is not the default option

Browse Source 
Otherwise the test is useless and does nothing. This caught 2 bugs in
the test suite.
This commit is contained in:
Joshua Nelson 2021-04-15 23:06:32 -04:00
parent ae54ee6507
commit fb7018b41e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_interface/src/tests.rs
View File

@ -391,6 +391,7 @@ fn test_codegen_options_tracking_hash() {
macro_rules! untracked { macro_rules! untracked {
($name: ident, $non_default_value: expr) => { ($name: ident, $non_default_value: expr) => {
assert_ne!(opts.cg.$name, $non_default_value);
opts.cg.$name = $non_default_value; opts.cg.$name = $non_default_value;
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash()); assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
}; };
@ -416,6 +417,7 @@ fn test_codegen_options_tracking_hash() {
macro_rules! tracked { macro_rules! tracked {
($name: ident, $non_default_value: expr) => { ($name: ident, $non_default_value: expr) => {
opts = reference.clone(); opts = reference.clone();
assert_ne!(opts.cg.$name, $non_default_value);
opts.cg.$name = $non_default_value; opts.cg.$name = $non_default_value;
assert_ne!(reference.dep_tracking_hash(), opts.dep_tracking_hash()); assert_ne!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
}; };
@ -461,6 +463,7 @@ fn test_debugging_options_tracking_hash() {
macro_rules! untracked { macro_rules! untracked {
($name: ident, $non_default_value: expr) => { ($name: ident, $non_default_value: expr) => {
assert_ne!(opts.debugging_opts.$name, $non_default_value);
opts.debugging_opts.$name = $non_default_value; opts.debugging_opts.$name = $non_default_value;
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash()); assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
}; };
@ -471,7 +474,7 @@ fn test_debugging_options_tracking_hash() {
untracked!(ast_json, true); untracked!(ast_json, true);
untracked!(ast_json_noexpand, true); untracked!(ast_json_noexpand, true);
untracked!(borrowck, String::from("other")); untracked!(borrowck, String::from("other"));
untracked!(deduplicate_diagnostics, true); untracked!(deduplicate_diagnostics, false);
untracked!(dep_tasks, true); untracked!(dep_tasks, true);
untracked!(dont_buffer_diagnostics, true); untracked!(dont_buffer_diagnostics, true);
untracked!(dump_dep_graph, true); untracked!(dump_dep_graph, true);
@ -515,7 +518,7 @@ fn test_debugging_options_tracking_hash() {
untracked!(self_profile_events, Some(vec![String::new()])); untracked!(self_profile_events, Some(vec![String::new()]));
untracked!(span_debug, true); untracked!(span_debug, true);
untracked!(span_free_formats, true); untracked!(span_free_formats, true);
untracked!(strip, Strip::None); untracked!(strip, Strip::Debuginfo);
untracked!(terminal_width, Some(80)); untracked!(terminal_width, Some(80));
untracked!(threads, 99); untracked!(threads, 99);
untracked!(time, true); untracked!(time, true);
@ -532,6 +535,7 @@ fn test_debugging_options_tracking_hash() {
macro_rules! tracked { macro_rules! tracked {
($name: ident, $non_default_value: expr) => { ($name: ident, $non_default_value: expr) => {
opts = reference.clone(); opts = reference.clone();
assert_ne!(opts.debugging_opts.$name, $non_default_value);
opts.debugging_opts.$name = $non_default_value; opts.debugging_opts.$name = $non_default_value;
assert_ne!(reference.dep_tracking_hash(), opts.dep_tracking_hash()); assert_ne!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
}; };

6
compiler/rustc_session/src/config.rs
View File

@ -156,7 +156,7 @@ pub enum InstrumentCoverage {
Off, Off,
} }
#[derive(Clone, PartialEq, Hash)] #[derive(Clone, PartialEq, Hash, Debug)]
pub enum LinkerPluginLto { pub enum LinkerPluginLto {
LinkerPlugin(PathBuf), LinkerPlugin(PathBuf),
LinkerPluginAuto, LinkerPluginAuto,
@ -172,7 +172,7 @@ impl LinkerPluginLto {
} }
} }
#[derive(Clone, PartialEq, Hash)] #[derive(Clone, PartialEq, Hash, Debug)]
pub enum SwitchWithOptPath { pub enum SwitchWithOptPath {
Enabled(Option<PathBuf>), Enabled(Option<PathBuf>),
Disabled, Disabled,
@ -778,7 +778,7 @@ pub enum CrateType {
impl_stable_hash_via_hash!(CrateType); impl_stable_hash_via_hash!(CrateType);
#[derive(Clone, Hash)] #[derive(Clone, Hash, Debug, PartialEq, Eq)]
pub enum Passes { pub enum Passes {
Some(Vec<String>), Some(Vec<String>),
All, All,

2
compiler/rustc_session/src/options.rs
View File

@ -1220,7 +1220,7 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
// - compiler/rustc_interface/src/tests.rs // - compiler/rustc_interface/src/tests.rs
} }
#[derive(Clone, Hash)] #[derive(Clone, Hash, PartialEq, Eq, Debug)]
pub enum WasiExecModel { pub enum WasiExecModel {
Command, Command,
Reactor, Reactor,