diff options
| author | Geoffry Song <goffrie@dropbox.com> | 2021-01-09 21:15:03 -0800 |
|---|---|---|
| committer | Caleb Cartwright <calebcartwright@users.noreply.github.com> | 2021-01-17 11:48:47 -0600 |
| commit | 0d60a616abedfc7e509db0b0576601eb5be82763 (patch) | |
| tree | fa2945510160a27c3cb94754a49a95c0f91274ee | |
| parent | 71863753bd53da50dd26bd8ab78a5da581e73f5c (diff) | |
| download | rust-0d60a616abedfc7e509db0b0576601eb5be82763.tar.gz rust-0d60a616abedfc7e509db0b0576601eb5be82763.zip | |
Disable deprecated_option_merge_imports tests on non-nightly
| -rw-r--r-- | src/config/mod.rs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/config/mod.rs b/src/config/mod.rs index a5356fc257e..dfce7977bfe 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -629,6 +629,9 @@ make_backup = false #[test] fn test_old_option_set() { + if !crate::is_nightly_channel!() { + return; + } let toml = r#" unstable_features = true merge_imports = true @@ -639,6 +642,9 @@ make_backup = false #[test] fn test_both_set() { + if !crate::is_nightly_channel!() { + return; + } let toml = r#" unstable_features = true merge_imports = true @@ -650,6 +656,9 @@ make_backup = false #[test] fn test_new_overridden() { + if !crate::is_nightly_channel!() { + return; + } let toml = r#" unstable_features = true merge_imports = true @@ -661,6 +670,9 @@ make_backup = false #[test] fn test_old_overridden() { + if !crate::is_nightly_channel!() { + return; + } let toml = r#" unstable_features = true imports_granularity = "Module" |