Change directory name in test_merged_config test (rust-lang#4409)

Fix rust-lang#4405
smklein · Sep 3, 2020 · 4e72871 · 4e72871
1 parent 3eab675
commit 4e72871
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -647,7 +647,7 @@ ignore = []
             // this test requires nightly
             None | Some("nightly") => {
                 let _outer_config = make_temp_file(
-                    "a/rustfmt.toml",
+                    "fmt_test_merged_config/rustfmt.toml",
                     r#"
 tab_spaces = 2
 fn_call_width = 50
@@ -656,7 +656,7 @@ ignore = ["b/main.rs", "util.rs"]
                 );
 
                 let inner_config = make_temp_file(
-                    "a/b/rustfmt.toml",
+                    "fmt_test_merged_config/b/rustfmt.toml",
                     r#"
 version = "two"
 tab_spaces = 3
@@ -672,8 +672,8 @@ ignore = []
                 assert_eq!(config.ignore().to_string(), r#"["main.rs"]"#);
 
                 let paths = paths.unwrap();
-                assert!(paths[0].ends_with("a/rustfmt.toml"));
-                assert!(paths[1].ends_with("a/b/rustfmt.toml"));
+                assert!(paths[0].ends_with("fmt_test_merged_config/rustfmt.toml"));
+                assert!(paths[1].ends_with("fmt_test_merged_config/b/rustfmt.toml"));
             }
             _ => {}
         };