rust-lang · tyilo · May 20, 2025 · May 20, 2025 · May 20, 2025 · May 20, 2025
diff --git a/src/formatting.rs b/src/formatting.rs
@@ -230,7 +230,9 @@ impl<'a, T: FormatHandler + 'a> FormatContext<'a, T> {
 
         // For some reason, the source_map does not include terminating
         // newlines so we must add one on for each file. This is sad.
-        source_file::append_newline(&mut visitor.buffer);
+        if !visitor.buffer.is_empty() {
+            source_file::append_newline(&mut visitor.buffer);
+        }
 
         format_lines(
             &mut visitor.buffer,

diff --git a/tests/cargo-fmt/main.rs b/tests/cargo-fmt/main.rs
@@ -84,7 +84,6 @@ fn cargo_fmt_out_of_line_test_modules() {
         "tests/mod-resolver/test-submodule-issue-5119/tests/test1.rs",
         "tests/mod-resolver/test-submodule-issue-5119/tests/test1/sub1.rs",
         "tests/mod-resolver/test-submodule-issue-5119/tests/test1/sub2.rs",
-        "tests/mod-resolver/test-submodule-issue-5119/tests/test1/sub3/sub4.rs",
     ];
     let args = [
         "-v",
@@ -95,7 +94,11 @@ fn cargo_fmt_out_of_line_test_modules() {
     let (stdout, _) = cargo_fmt(&args);
     for file in expected_modified_files {
         let path = Path::new(file).canonicalize().unwrap();
-        assert!(stdout.contains(&format!("Diff in {}", path.display())))
+        assert!(
+            stdout.contains(&format!("Diff in {}", path.display())),
+            "{}",
+            path.display()
+        );
     }
 }
 

diff --git a/tests/source/configs/reorder_modules/dolor/mod.rs b/tests/source/configs/reorder_modules/dolor/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/configs/reorder_modules/ipsum/mod.rs b/tests/source/configs/reorder_modules/ipsum/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/configs/reorder_modules/lorem/mod.rs b/tests/source/configs/reorder_modules/lorem/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/configs/reorder_modules/sit/mod.rs b/tests/source/configs/reorder_modules/sit/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/empty-lines-1.rs b/tests/source/empty-lines-1.rs
@@ -0,0 +1 @@
+
diff --git a/tests/source/empty-lines-2.rs b/tests/source/empty-lines-2.rs
@@ -0,0 +1,2 @@
+
+
diff --git a/tests/source/empty-lines-3.rs b/tests/source/empty-lines-3.rs
@@ -0,0 +1,3 @@
+
+
+
diff --git a/tests/source/reorder_modules/A2/mod.rs b/tests/source/reorder_modules/A2/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/ABCD/mod.rs b/tests/source/reorder_modules/ABCD/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/ZYXW/mod.rs b/tests/source/reorder_modules/ZYXW/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/ZYXW_/mod.rs b/tests/source/reorder_modules/ZYXW_/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/ZY_XW/mod.rs b/tests/source/reorder_modules/ZY_XW/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/Z_YXW/mod.rs b/tests/source/reorder_modules/Z_YXW/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/_ZYXW/mod.rs b/tests/source/reorder_modules/_ZYXW/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/_abcd/mod.rs b/tests/source/reorder_modules/_abcd/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/a1/mod.rs b/tests/source/reorder_modules/a1/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/abcd/mod.rs b/tests/source/reorder_modules/abcd/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/u128/mod.rs b/tests/source/reorder_modules/u128/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/u16/mod.rs b/tests/source/reorder_modules/u16/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/u256/mod.rs b/tests/source/reorder_modules/u256/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/u32/mod.rs b/tests/source/reorder_modules/u32/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/u64/mod.rs b/tests/source/reorder_modules/u64/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/u8/mod.rs b/tests/source/reorder_modules/u8/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/u_zzz/mod.rs b/tests/source/reorder_modules/u_zzz/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/ua/mod.rs b/tests/source/reorder_modules/ua/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/usize/mod.rs b/tests/source/reorder_modules/usize/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/uz/mod.rs b/tests/source/reorder_modules/uz/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v0/mod.rs b/tests/source/reorder_modules/v0/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v00/mod.rs b/tests/source/reorder_modules/v00/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v000/mod.rs b/tests/source/reorder_modules/v000/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v001/mod.rs b/tests/source/reorder_modules/v001/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v009/mod.rs b/tests/source/reorder_modules/v009/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v00t/mod.rs b/tests/source/reorder_modules/v00t/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v01/mod.rs b/tests/source/reorder_modules/v01/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v010/mod.rs b/tests/source/reorder_modules/v010/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v09/mod.rs b/tests/source/reorder_modules/v09/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v0s/mod.rs b/tests/source/reorder_modules/v0s/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v0u/mod.rs b/tests/source/reorder_modules/v0u/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v1/mod.rs b/tests/source/reorder_modules/v1/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v10/mod.rs b/tests/source/reorder_modules/v10/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/v9/mod.rs b/tests/source/reorder_modules/v9/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/w005s09t/mod.rs b/tests/source/reorder_modules/w005s09t/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/w5s009t/mod.rs b/tests/source/reorder_modules/w5s009t/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/x64/mod.rs b/tests/source/reorder_modules/x64/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/x86/mod.rs b/tests/source/reorder_modules/x86/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/x86_128/mod.rs b/tests/source/reorder_modules/x86_128/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/x86_32/mod.rs b/tests/source/reorder_modules/x86_32/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/x86_64/mod.rs b/tests/source/reorder_modules/x86_64/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/x87/mod.rs b/tests/source/reorder_modules/x87/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/source/reorder_modules/zyxw/mod.rs b/tests/source/reorder_modules/zyxw/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/configs/reorder_modules/dolor/mod.rs b/tests/target/configs/reorder_modules/dolor/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/configs/reorder_modules/ipsum/mod.rs b/tests/target/configs/reorder_modules/ipsum/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/configs/reorder_modules/lorem/mod.rs b/tests/target/configs/reorder_modules/lorem/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/configs/reorder_modules/sit/mod.rs b/tests/target/configs/reorder_modules/sit/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/empty-lines-1.rs b/tests/target/empty-lines-1.rs
diff --git a/tests/target/empty-lines-2.rs b/tests/target/empty-lines-2.rs
diff --git a/tests/target/empty-lines-3.rs b/tests/target/empty-lines-3.rs
diff --git a/tests/target/empty_file.rs b/tests/target/empty_file.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/inner-module-path/b.rs b/tests/target/inner-module-path/b.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/inner-module-path/c/d.rs b/tests/target/inner-module-path/c/d.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/A2/mod.rs b/tests/target/reorder_modules/A2/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/ABCD/mod.rs b/tests/target/reorder_modules/ABCD/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/ZYXW/mod.rs b/tests/target/reorder_modules/ZYXW/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/ZYXW_/mod.rs b/tests/target/reorder_modules/ZYXW_/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/ZY_XW/mod.rs b/tests/target/reorder_modules/ZY_XW/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/Z_YXW/mod.rs b/tests/target/reorder_modules/Z_YXW/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/_ZYXW/mod.rs b/tests/target/reorder_modules/_ZYXW/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/_abcd/mod.rs b/tests/target/reorder_modules/_abcd/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/a1/mod.rs b/tests/target/reorder_modules/a1/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/abcd/mod.rs b/tests/target/reorder_modules/abcd/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/u128/mod.rs b/tests/target/reorder_modules/u128/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/u16/mod.rs b/tests/target/reorder_modules/u16/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/u256/mod.rs b/tests/target/reorder_modules/u256/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/u32/mod.rs b/tests/target/reorder_modules/u32/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/u64/mod.rs b/tests/target/reorder_modules/u64/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/u8/mod.rs b/tests/target/reorder_modules/u8/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/u_zzz/mod.rs b/tests/target/reorder_modules/u_zzz/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/ua/mod.rs b/tests/target/reorder_modules/ua/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/usize/mod.rs b/tests/target/reorder_modules/usize/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/uz/mod.rs b/tests/target/reorder_modules/uz/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v0/mod.rs b/tests/target/reorder_modules/v0/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v00/mod.rs b/tests/target/reorder_modules/v00/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v000/mod.rs b/tests/target/reorder_modules/v000/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v001/mod.rs b/tests/target/reorder_modules/v001/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v009/mod.rs b/tests/target/reorder_modules/v009/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v00t/mod.rs b/tests/target/reorder_modules/v00t/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v01/mod.rs b/tests/target/reorder_modules/v01/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v010/mod.rs b/tests/target/reorder_modules/v010/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v09/mod.rs b/tests/target/reorder_modules/v09/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v0s/mod.rs b/tests/target/reorder_modules/v0s/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v0u/mod.rs b/tests/target/reorder_modules/v0u/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v1/mod.rs b/tests/target/reorder_modules/v1/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v10/mod.rs b/tests/target/reorder_modules/v10/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/v9/mod.rs b/tests/target/reorder_modules/v9/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/w005s09t/mod.rs b/tests/target/reorder_modules/w005s09t/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/w5s009t/mod.rs b/tests/target/reorder_modules/w5s009t/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/x64/mod.rs b/tests/target/reorder_modules/x64/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/x86/mod.rs b/tests/target/reorder_modules/x86/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/x86_128/mod.rs b/tests/target/reorder_modules/x86_128/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/x86_32/mod.rs b/tests/target/reorder_modules/x86_32/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/x86_64/mod.rs b/tests/target/reorder_modules/x86_64/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/x87/mod.rs b/tests/target/reorder_modules/x87/mod.rs
@@ -1 +0,0 @@
-

diff --git a/tests/target/reorder_modules/zyxw/mod.rs b/tests/target/reorder_modules/zyxw/mod.rs
@@ -1 +0,0 @@
-