tests: fix tests that use unstable config opts

Author: calebcartwright

src/config.rs

@@ -698,13 +698,31 @@ ignore = []
         }
 
         #[test]
-        fn test_from_toml_not_nightly() {
+        fn test_from_toml_not_nightly_unstable_set() {
             if is_nightly_channel!() {
                 // This test requires non-nightly
                 return;
             }
-            let config = Config::from_toml("unstable_features = true", Path::new("")).unwrap();
-            assert_eq!(config.was_set().unstable_features(), false);
+            let toml = r#"
+                unstable_features = true
+                merge_imports = true
+            "#;
+            let config = Config::from_toml(toml, Path::new("")).unwrap();
+            assert_eq!(config.was_set().unstable_features(), true);
+            assert_eq!(config.was_set().merge_imports(), true);
+            assert_eq!(config.unstable_features(), true);
+            assert_eq!(config.merge_imports(), true);
+        }
+
+        #[test]
+        fn test_from_toml_not_nightly_unstable_not_set() {
+            if is_nightly_channel!() {
+                // This test requires non-nightly
+                return;
+            }
+            let config = Config::from_toml("merge_imports = true", Path::new("")).unwrap();
+            assert_eq!(config.was_set().merge_imports(), false);
+            assert_eq!(config.merge_imports(), false);
         }
 
         #[test]
@@ -749,8 +767,12 @@ ignore = []
             }
             let mut config = Config::default();
             assert_eq!(config.unstable_features(), false);
+            config.override_value("merge_imports", "true");
+            assert_eq!(config.merge_imports(), false);
             config.override_value("unstable_features", "true");
             assert_eq!(config.unstable_features(), true);
+            config.override_value("merge_imports", "true");
+            assert_eq!(config.merge_imports(), true);
         }
 
         #[test]

src/test/configuration_snippet.rs

@@ -96,6 +96,9 @@ impl ConfigCodeBlock {
 
     fn get_block_config(&self) -> Config {
         let mut config = Config::default();
+        if !crate::is_nightly_channel!() {
+            config.override_value("unstable_features", "true");
+        }
         if self.config_name.is_some() && self.config_value.is_some() {
             config.override_value(
                 self.config_name.as_ref().unwrap(),

src/test/mod.rs

@@ -629,6 +629,10 @@ fn read_config(filename: &Path) -> (Config, OperationSetting, EmitterConfig) {
         get_config(filename.with_extension("toml").file_name().map(Path::new))
     };
 
+    if !config.was_set().unstable_features() && !is_nightly_channel!() {
+        config.override_value("unstable_features", "true");
+    }
+
     let mut operation_setting = OperationSetting::default();
     let mut emitter_config = EmitterConfig::default();
     for (key, val) in &sig_comments {

tests/config/small_tabs.toml

@@ -1,3 +1,4 @@
+unstable_features = true
 max_width = 100
 comment_width = 80
 tab_spaces = 2