Skip to content

Commit 34d374e

Browse files
topecongirocalebcartwright
authored andcommitted
Use <stdin> when emitting stdin as filename (#4298)
# Conflicts: # src/config/file_lines.rs # src/rustfmt/main.rs # src/test/mod.rs
1 parent 894a3c0 commit 34d374e

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/config/file_lines.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl fmt::Display for FileName {
3939
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
4040
match self {
4141
FileName::Real(p) => write!(f, "{}", p.to_str().unwrap()),
42-
FileName::Stdin => write!(f, "stdin"),
42+
FileName::Stdin => write!(f, "<stdin>"),
4343
}
4444
}
4545
}

src/test/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,9 +466,9 @@ fn stdin_formatting_smoke_test() {
466466
}
467467

468468
#[cfg(not(windows))]
469-
assert_eq!(buf, "stdin:\n\nfn main() {}\n".as_bytes());
469+
assert_eq!(buf, "<stdin>:\n\nfn main() {}\n".as_bytes());
470470
#[cfg(windows)]
471-
assert_eq!(buf, "stdin:\n\nfn main() {}\r\n".as_bytes());
471+
assert_eq!(buf, "<stdin>:\n\nfn main() {}\r\n".as_bytes());
472472
}
473473

474474
#[test]
@@ -1013,5 +1013,5 @@ fn verify_check_l_works_with_stdin() {
10131013
.wait_with_output()
10141014
.expect("Failed to wait on rustfmt child");
10151015
assert!(output.status.success());
1016-
assert_eq!(std::str::from_utf8(&output.stdout).unwrap(), "stdin\n");
1016+
assert_eq!(std::str::from_utf8(&output.stdout).unwrap(), "<stdin>\n");
10171017
}

tests/writemode/target/stdin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"name":"stdin","mismatches":[{"original_begin_line":1,"original_end_line":6,"expected_begin_line":1,"expected_end_line":2,"original":"\nfn\n some( )\n{\n}\nfn main () {}\n","expected":"fn some() {}\nfn main() {}\n"}]}]
1+
[{"name":"<stdin>","mismatches":[{"original_begin_line":1,"original_end_line":6,"expected_begin_line":1,"expected_end_line":2,"original":"\nfn\n some( )\n{\n}\nfn main () {}\n","expected":"fn some() {}\nfn main() {}\n"}]}]

tests/writemode/target/stdin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<checkstyle version="4.3"><file name="stdin"><error line="1" severity="warning" message="Should be `fn some() {}`" /><error line="2" severity="warning" message="Should be `fn main() {}`" /></file></checkstyle>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<checkstyle version="4.3"><file name="<stdin>"><error line="1" severity="warning" message="Should be `fn some() {}`" /><error line="2" severity="warning" message="Should be `fn main() {}`" /></file></checkstyle>

0 commit comments

Comments
 (0)