Skip to content

Commit 4e72871

Browse files
authored
Change directory name in test_merged_config test (#4409)
Fix #4405
1 parent 3eab675 commit 4e72871

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Diff for: src/config.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ ignore = []
647647
// this test requires nightly
648648
None | Some("nightly") => {
649649
let _outer_config = make_temp_file(
650-
"a/rustfmt.toml",
650+
"fmt_test_merged_config/rustfmt.toml",
651651
r#"
652652
tab_spaces = 2
653653
fn_call_width = 50
@@ -656,7 +656,7 @@ ignore = ["b/main.rs", "util.rs"]
656656
);
657657

658658
let inner_config = make_temp_file(
659-
"a/b/rustfmt.toml",
659+
"fmt_test_merged_config/b/rustfmt.toml",
660660
r#"
661661
version = "two"
662662
tab_spaces = 3
@@ -672,8 +672,8 @@ ignore = []
672672
assert_eq!(config.ignore().to_string(), r#"["main.rs"]"#);
673673

674674
let paths = paths.unwrap();
675-
assert!(paths[0].ends_with("a/rustfmt.toml"));
676-
assert!(paths[1].ends_with("a/b/rustfmt.toml"));
675+
assert!(paths[0].ends_with("fmt_test_merged_config/rustfmt.toml"));
676+
assert!(paths[1].ends_with("fmt_test_merged_config/b/rustfmt.toml"));
677677
}
678678
_ => {}
679679
};

0 commit comments

Comments
 (0)