Skip to content

Commit 0d60a61

Browse files
goffriecalebcartwright
authored andcommitted
Disable deprecated_option_merge_imports tests on non-nightly
1 parent 7186375 commit 0d60a61

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

Diff for: src/config/mod.rs

+12
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,9 @@ make_backup = false
629629

630630
#[test]
631631
fn test_old_option_set() {
632+
if !crate::is_nightly_channel!() {
633+
return;
634+
}
632635
let toml = r#"
633636
unstable_features = true
634637
merge_imports = true
@@ -639,6 +642,9 @@ make_backup = false
639642

640643
#[test]
641644
fn test_both_set() {
645+
if !crate::is_nightly_channel!() {
646+
return;
647+
}
642648
let toml = r#"
643649
unstable_features = true
644650
merge_imports = true
@@ -650,6 +656,9 @@ make_backup = false
650656

651657
#[test]
652658
fn test_new_overridden() {
659+
if !crate::is_nightly_channel!() {
660+
return;
661+
}
653662
let toml = r#"
654663
unstable_features = true
655664
merge_imports = true
@@ -661,6 +670,9 @@ make_backup = false
661670

662671
#[test]
663672
fn test_old_overridden() {
673+
if !crate::is_nightly_channel!() {
674+
return;
675+
}
664676
let toml = r#"
665677
unstable_features = true
666678
imports_granularity = "Module"

0 commit comments

Comments
 (0)