From 0d60a616abedfc7e509db0b0576601eb5be82763 Mon Sep 17 00:00:00 2001
From: Geoffry Song <goffrie@dropbox.com>
Date: Sat, 9 Jan 2021 21:15:03 -0800
Subject: [PATCH] Disable deprecated_option_merge_imports tests on non-nightly

---
 src/config/mod.rs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/config/mod.rs b/src/config/mod.rs
index a5356fc257e3..dfce7977bfea 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"