From 34d374ee5d23951d166ca3f51d477ddf6526a2fa Mon Sep 17 00:00:00 2001
From: Seiichi Uchida <seuchida@gmail.com>
Date: Fri, 3 Jul 2020 11:13:16 +0900
Subject: [PATCH] Use <stdin> when emitting stdin as filename (#4298)

# Conflicts:
#	src/config/file_lines.rs
#	src/rustfmt/main.rs
#	src/test/mod.rs
---
 src/config/file_lines.rs          | 2 +-
 src/test/mod.rs                   | 6 +++---
 tests/writemode/target/stdin.json | 2 +-
 tests/writemode/target/stdin.xml  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/config/file_lines.rs b/src/config/file_lines.rs
index 7b498dc46b32..e4e51a3f3b40 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 db1cf88479cf..2d5a8f22053f 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");
 }
diff --git a/tests/writemode/target/stdin.json b/tests/writemode/target/stdin.json
index 6f5d5bfb8ca2..dbf2c4863229 100644
--- a/tests/writemode/target/stdin.json
+++ b/tests/writemode/target/stdin.json
@@ -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"}]}]
+[{"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"}]}]
diff --git a/tests/writemode/target/stdin.xml b/tests/writemode/target/stdin.xml
index e70708338f56..a7301bbc553c 100644
--- a/tests/writemode/target/stdin.xml
+++ b/tests/writemode/target/stdin.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>
+<?xml version="1.0" encoding="utf-8"?>
+<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>