about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSeiichi Uchida <seuchida@gmail.com>2020-07-03 11:13:16 +0900
committerCaleb Cartwright <calebcartwright@users.noreply.github.com>2022-01-02 10:06:06 -0600
commit34d374ee5d23951d166ca3f51d477ddf6526a2fa (patch)
tree9f236077096fa2d03d40c056ab6645ad326073bf /src
parent894a3c0e7745ece39fcee89d38389a789cfe520a (diff)
Use <stdin> when emitting stdin as filename (#4298)
# Conflicts:
#	src/config/file_lines.rs
#	src/rustfmt/main.rs
#	src/test/mod.rs
Diffstat (limited to 'src')
-rw-r--r--src/config/file_lines.rs2
-rw-r--r--src/test/mod.rs6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/config/file_lines.rs b/src/config/file_lines.rs
index 7b498dc46b3..e4e51a3f3b4 100644
--- a/src/config/file_lines.rs
+++ b/src/config/file_lines.rs
@@ -39,7 +39,7 @@ impl fmt::Display for FileName {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             FileName::Real(p) => write!(f, "{}", p.to_str().unwrap()),
-            FileName::Stdin => write!(f, "stdin"),
+            FileName::Stdin => write!(f, "<stdin>"),
         }
     }
 }
diff --git a/src/test/mod.rs b/src/test/mod.rs
index db1cf88479c..2d5a8f22053 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -466,9 +466,9 @@ fn stdin_formatting_smoke_test() {
     }
 
     #[cfg(not(windows))]
-    assert_eq!(buf, "stdin:\n\nfn main() {}\n".as_bytes());
+    assert_eq!(buf, "<stdin>:\n\nfn main() {}\n".as_bytes());
     #[cfg(windows)]
-    assert_eq!(buf, "stdin:\n\nfn main() {}\r\n".as_bytes());
+    assert_eq!(buf, "<stdin>:\n\nfn main() {}\r\n".as_bytes());
 }
 
 #[test]
@@ -1013,5 +1013,5 @@ fn verify_check_l_works_with_stdin() {
         .wait_with_output()
         .expect("Failed to wait on rustfmt child");
     assert!(output.status.success());
-    assert_eq!(std::str::from_utf8(&output.stdout).unwrap(), "stdin\n");
+    assert_eq!(std::str::from_utf8(&output.stdout).unwrap(), "<stdin>\n");
 }