Merge pull request #3897 from calebcartwright/fix-test-nested-int-file

fix a few tests

Author: scampi

Diff for: src/cargo-fmt/main.rs

@@ -917,10 +917,11 @@ mod cargo_fmt_tests {
             let exp_other = PathBuf::from(
                 "tests/nested-test-files/root-and-nested-tests/tests/nested/other.rs",
             );
-            assert_eq!(
-                Some(vec![exp_baz, exp_foo_bar, exp_other]),
-                get_nested_integration_test_files(&target_dir, &target_dir),
-            )
+            let files = get_nested_integration_test_files(&target_dir, &target_dir).unwrap();
+            assert_eq!(3, files.len());
+            assert!(files.contains(&exp_baz));
+            assert!(files.contains(&exp_foo_bar));
+            assert!(files.contains(&exp_other));
         }
     }
 

Diff for: src/config/mod.rs

@@ -476,6 +476,9 @@ mod test {
 
     #[test]
     fn test_valid_license_template_path() {
+        if !crate::is_nightly_channel!() {
+            return;
+        }
         let toml = r#"license_template_path = "tests/license-template/lt.txt""#;
         let config = Config::from_toml(toml, Path::new("")).unwrap();
         assert!(config.license_template.is_some());

Diff for: tests/config/issue-3779.toml

@@ -1,4 +1,3 @@
-unstable_features = true
 ignore = [
   "tests/**/issue-3779/ice.rs"
 ]

Diff for: tests/source/issue-3779/lib.rs

@@ -1,3 +1,4 @@
+// rustfmt-unstable: true
 // rustfmt-config: issue-3779.toml
 
 #[path = "ice.rs"]

Diff for: tests/target/issue-3779/lib.rs

@@ -1,3 +1,4 @@
+// rustfmt-unstable: true
 // rustfmt-config: issue-3779.toml
 
 #[path = "ice.rs"]