From 4023d79dcb18caae2f43dbe7b5f28abea0fcd8b1 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Fri, 12 Jun 2026 12:28:40 -0400 Subject: [PATCH 1/5] Let empty files be empty files (reprise) --- src/formatting.rs | 2 +- src/source_file.rs | 21 +++++++++++++++++-- src/test/mod.rs | 19 +++++++++++++++++ .../config/empty_file_style_edition_2027.toml | 1 + tests/config/newline_file.toml | 1 + tests/source/empty_file_style_edition_2027.rs | 0 tests/source/newline_file.rs | 1 + tests/source/reorder_modules_2027/A2/mod.rs | 0 tests/source/reorder_modules_2027/ABCD/mod.rs | 0 tests/source/reorder_modules_2027/ZYXW/mod.rs | 0 .../source/reorder_modules_2027/ZYXW_/mod.rs | 0 .../source/reorder_modules_2027/ZY_XW/mod.rs | 0 .../source/reorder_modules_2027/Z_YXW/mod.rs | 0 .../source/reorder_modules_2027/_ZYXW/mod.rs | 0 .../source/reorder_modules_2027/_abcd/mod.rs | 0 tests/source/reorder_modules_2027/a1/mod.rs | 0 .../source/reorder_modules_2027/abcde/mod.rs | 1 - .../disabled_style_edition_2027.rs | 0 .../enabled_style_edition_2027.rs | 0 tests/source/reorder_modules_2027/u128/mod.rs | 0 tests/source/reorder_modules_2027/u16/mod.rs | 0 tests/source/reorder_modules_2027/u256/mod.rs | 0 tests/source/reorder_modules_2027/u32/mod.rs | 0 tests/source/reorder_modules_2027/u64/mod.rs | 0 tests/source/reorder_modules_2027/u8/mod.rs | 0 .../source/reorder_modules_2027/u_zzz/mod.rs | 0 tests/source/reorder_modules_2027/ua/mod.rs | 0 .../source/reorder_modules_2027/usize/mod.rs | 0 tests/source/reorder_modules_2027/uz/mod.rs | 0 tests/source/reorder_modules_2027/v0/mod.rs | 0 tests/source/reorder_modules_2027/v00/mod.rs | 0 tests/source/reorder_modules_2027/v000/mod.rs | 0 tests/source/reorder_modules_2027/v001/mod.rs | 0 tests/source/reorder_modules_2027/v009/mod.rs | 0 tests/source/reorder_modules_2027/v00t/mod.rs | 0 tests/source/reorder_modules_2027/v01/mod.rs | 0 tests/source/reorder_modules_2027/v010/mod.rs | 0 tests/source/reorder_modules_2027/v09/mod.rs | 0 tests/source/reorder_modules_2027/v0s/mod.rs | 0 tests/source/reorder_modules_2027/v0u/mod.rs | 0 tests/source/reorder_modules_2027/v1/mod.rs | 0 tests/source/reorder_modules_2027/v10/mod.rs | 0 tests/source/reorder_modules_2027/v9/mod.rs | 0 .../reorder_modules_2027/w005s09t/mod.rs | 0 .../reorder_modules_2027/w5s009t/mod.rs | 0 tests/source/reorder_modules_2027/x64/mod.rs | 0 tests/source/reorder_modules_2027/x86/mod.rs | 0 .../reorder_modules_2027/x86_128/mod.rs | 0 .../source/reorder_modules_2027/x86_32/mod.rs | 0 .../source/reorder_modules_2027/x86_64/mod.rs | 0 tests/source/reorder_modules_2027/x87/mod.rs | 0 .../source/reorder_modules_2027/zyxwv/mod.rs | 1 - tests/target/empty_file_style_edition_2027.rs | 0 tests/target/newline_file.rs | 1 + tests/target/reorder_modules_2027/A2/mod.rs | 0 tests/target/reorder_modules_2027/ABCD/mod.rs | 0 tests/target/reorder_modules_2027/ZYXW/mod.rs | 0 .../target/reorder_modules_2027/ZYXW_/mod.rs | 0 .../target/reorder_modules_2027/ZY_XW/mod.rs | 0 .../target/reorder_modules_2027/Z_YXW/mod.rs | 0 .../target/reorder_modules_2027/_ZYXW/mod.rs | 0 .../target/reorder_modules_2027/_abcd/mod.rs | 0 tests/target/reorder_modules_2027/a1/mod.rs | 0 .../target/reorder_modules_2027/abcde/mod.rs | 1 - .../disabled_style_edition_2027.rs | 0 .../enabled_style_edition_2027.rs | 0 tests/target/reorder_modules_2027/u128/mod.rs | 0 tests/target/reorder_modules_2027/u16/mod.rs | 0 tests/target/reorder_modules_2027/u256/mod.rs | 0 tests/target/reorder_modules_2027/u32/mod.rs | 0 tests/target/reorder_modules_2027/u64/mod.rs | 0 tests/target/reorder_modules_2027/u8/mod.rs | 0 .../target/reorder_modules_2027/u_zzz/mod.rs | 0 tests/target/reorder_modules_2027/ua/mod.rs | 0 .../target/reorder_modules_2027/usize/mod.rs | 0 tests/target/reorder_modules_2027/uz/mod.rs | 0 tests/target/reorder_modules_2027/v0/mod.rs | 0 tests/target/reorder_modules_2027/v00/mod.rs | 0 tests/target/reorder_modules_2027/v000/mod.rs | 0 tests/target/reorder_modules_2027/v001/mod.rs | 0 tests/target/reorder_modules_2027/v009/mod.rs | 0 tests/target/reorder_modules_2027/v00t/mod.rs | 0 tests/target/reorder_modules_2027/v01/mod.rs | 0 tests/target/reorder_modules_2027/v010/mod.rs | 0 tests/target/reorder_modules_2027/v09/mod.rs | 0 tests/target/reorder_modules_2027/v0s/mod.rs | 0 tests/target/reorder_modules_2027/v0u/mod.rs | 0 tests/target/reorder_modules_2027/v1/mod.rs | 0 tests/target/reorder_modules_2027/v10/mod.rs | 0 tests/target/reorder_modules_2027/v9/mod.rs | 0 .../reorder_modules_2027/w005s09t/mod.rs | 0 .../reorder_modules_2027/w5s009t/mod.rs | 0 tests/target/reorder_modules_2027/x64/mod.rs | 0 tests/target/reorder_modules_2027/x86/mod.rs | 0 .../reorder_modules_2027/x86_128/mod.rs | 0 .../target/reorder_modules_2027/x86_32/mod.rs | 0 .../target/reorder_modules_2027/x86_64/mod.rs | 0 tests/target/reorder_modules_2027/x87/mod.rs | 0 .../target/reorder_modules_2027/zyxwv/mod.rs | 1 - 99 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 tests/config/empty_file_style_edition_2027.toml create mode 100644 tests/config/newline_file.toml create mode 100644 tests/source/empty_file_style_edition_2027.rs create mode 100644 tests/source/newline_file.rs create mode 100644 tests/source/reorder_modules_2027/A2/mod.rs create mode 100644 tests/source/reorder_modules_2027/ABCD/mod.rs create mode 100644 tests/source/reorder_modules_2027/ZYXW/mod.rs create mode 100644 tests/source/reorder_modules_2027/ZYXW_/mod.rs create mode 100644 tests/source/reorder_modules_2027/ZY_XW/mod.rs create mode 100644 tests/source/reorder_modules_2027/Z_YXW/mod.rs create mode 100644 tests/source/reorder_modules_2027/_ZYXW/mod.rs create mode 100644 tests/source/reorder_modules_2027/_abcd/mod.rs create mode 100644 tests/source/reorder_modules_2027/a1/mod.rs rename tests/source/{reorder_modules => reorder_modules_2027}/disabled_style_edition_2027.rs (100%) rename tests/source/{reorder_modules => reorder_modules_2027}/enabled_style_edition_2027.rs (100%) create mode 100644 tests/source/reorder_modules_2027/u128/mod.rs create mode 100644 tests/source/reorder_modules_2027/u16/mod.rs create mode 100644 tests/source/reorder_modules_2027/u256/mod.rs create mode 100644 tests/source/reorder_modules_2027/u32/mod.rs create mode 100644 tests/source/reorder_modules_2027/u64/mod.rs create mode 100644 tests/source/reorder_modules_2027/u8/mod.rs create mode 100644 tests/source/reorder_modules_2027/u_zzz/mod.rs create mode 100644 tests/source/reorder_modules_2027/ua/mod.rs create mode 100644 tests/source/reorder_modules_2027/usize/mod.rs create mode 100644 tests/source/reorder_modules_2027/uz/mod.rs create mode 100644 tests/source/reorder_modules_2027/v0/mod.rs create mode 100644 tests/source/reorder_modules_2027/v00/mod.rs create mode 100644 tests/source/reorder_modules_2027/v000/mod.rs create mode 100644 tests/source/reorder_modules_2027/v001/mod.rs create mode 100644 tests/source/reorder_modules_2027/v009/mod.rs create mode 100644 tests/source/reorder_modules_2027/v00t/mod.rs create mode 100644 tests/source/reorder_modules_2027/v01/mod.rs create mode 100644 tests/source/reorder_modules_2027/v010/mod.rs create mode 100644 tests/source/reorder_modules_2027/v09/mod.rs create mode 100644 tests/source/reorder_modules_2027/v0s/mod.rs create mode 100644 tests/source/reorder_modules_2027/v0u/mod.rs create mode 100644 tests/source/reorder_modules_2027/v1/mod.rs create mode 100644 tests/source/reorder_modules_2027/v10/mod.rs create mode 100644 tests/source/reorder_modules_2027/v9/mod.rs create mode 100644 tests/source/reorder_modules_2027/w005s09t/mod.rs create mode 100644 tests/source/reorder_modules_2027/w5s009t/mod.rs create mode 100644 tests/source/reorder_modules_2027/x64/mod.rs create mode 100644 tests/source/reorder_modules_2027/x86/mod.rs create mode 100644 tests/source/reorder_modules_2027/x86_128/mod.rs create mode 100644 tests/source/reorder_modules_2027/x86_32/mod.rs create mode 100644 tests/source/reorder_modules_2027/x86_64/mod.rs create mode 100644 tests/source/reorder_modules_2027/x87/mod.rs create mode 100644 tests/target/empty_file_style_edition_2027.rs create mode 100644 tests/target/newline_file.rs create mode 100644 tests/target/reorder_modules_2027/A2/mod.rs create mode 100644 tests/target/reorder_modules_2027/ABCD/mod.rs create mode 100644 tests/target/reorder_modules_2027/ZYXW/mod.rs create mode 100644 tests/target/reorder_modules_2027/ZYXW_/mod.rs create mode 100644 tests/target/reorder_modules_2027/ZY_XW/mod.rs create mode 100644 tests/target/reorder_modules_2027/Z_YXW/mod.rs create mode 100644 tests/target/reorder_modules_2027/_ZYXW/mod.rs create mode 100644 tests/target/reorder_modules_2027/_abcd/mod.rs create mode 100644 tests/target/reorder_modules_2027/a1/mod.rs rename tests/target/{reorder_modules => reorder_modules_2027}/disabled_style_edition_2027.rs (100%) rename tests/target/{reorder_modules => reorder_modules_2027}/enabled_style_edition_2027.rs (100%) create mode 100644 tests/target/reorder_modules_2027/u128/mod.rs create mode 100644 tests/target/reorder_modules_2027/u16/mod.rs create mode 100644 tests/target/reorder_modules_2027/u256/mod.rs create mode 100644 tests/target/reorder_modules_2027/u32/mod.rs create mode 100644 tests/target/reorder_modules_2027/u64/mod.rs create mode 100644 tests/target/reorder_modules_2027/u8/mod.rs create mode 100644 tests/target/reorder_modules_2027/u_zzz/mod.rs create mode 100644 tests/target/reorder_modules_2027/ua/mod.rs create mode 100644 tests/target/reorder_modules_2027/usize/mod.rs create mode 100644 tests/target/reorder_modules_2027/uz/mod.rs create mode 100644 tests/target/reorder_modules_2027/v0/mod.rs create mode 100644 tests/target/reorder_modules_2027/v00/mod.rs create mode 100644 tests/target/reorder_modules_2027/v000/mod.rs create mode 100644 tests/target/reorder_modules_2027/v001/mod.rs create mode 100644 tests/target/reorder_modules_2027/v009/mod.rs create mode 100644 tests/target/reorder_modules_2027/v00t/mod.rs create mode 100644 tests/target/reorder_modules_2027/v01/mod.rs create mode 100644 tests/target/reorder_modules_2027/v010/mod.rs create mode 100644 tests/target/reorder_modules_2027/v09/mod.rs create mode 100644 tests/target/reorder_modules_2027/v0s/mod.rs create mode 100644 tests/target/reorder_modules_2027/v0u/mod.rs create mode 100644 tests/target/reorder_modules_2027/v1/mod.rs create mode 100644 tests/target/reorder_modules_2027/v10/mod.rs create mode 100644 tests/target/reorder_modules_2027/v9/mod.rs create mode 100644 tests/target/reorder_modules_2027/w005s09t/mod.rs create mode 100644 tests/target/reorder_modules_2027/w5s009t/mod.rs create mode 100644 tests/target/reorder_modules_2027/x64/mod.rs create mode 100644 tests/target/reorder_modules_2027/x86/mod.rs create mode 100644 tests/target/reorder_modules_2027/x86_128/mod.rs create mode 100644 tests/target/reorder_modules_2027/x86_32/mod.rs create mode 100644 tests/target/reorder_modules_2027/x86_64/mod.rs create mode 100644 tests/target/reorder_modules_2027/x87/mod.rs diff --git a/src/formatting.rs b/src/formatting.rs index 7f2a14f9e31..62876841813 100644 --- a/src/formatting.rs +++ b/src/formatting.rs @@ -236,7 +236,7 @@ impl<'a, T: FormatHandler + 'a> FormatContext<'a, T> { .file_lines() .contains_line(&path, num_newlines + 1) { - source_file::append_newline(&mut visitor.buffer); + source_file::append_newline(&mut visitor.buffer, self.config.style_edition()); } format_lines( diff --git a/src/source_file.rs b/src/source_file.rs index b0ec24f3db6..e30534b8fae 100644 --- a/src/source_file.rs +++ b/src/source_file.rs @@ -3,10 +3,10 @@ use std::io::{self, Write}; use std::path::Path; use std::sync::Arc; -use crate::NewlineStyle; use crate::config::FileName; use crate::emitter::{self, Emitter}; use crate::parse::session::ParseSess; +use crate::{NewlineStyle, StyleEdition}; #[cfg(test)] use crate::config::Config; @@ -16,10 +16,27 @@ use crate::create_emitter; use crate::formatting::FileRecord; // Append a newline to the end of each file. -pub(crate) fn append_newline(s: &mut String) { +pub(crate) fn append_newline(s: &mut String, style_edition: StyleEdition) { + if style_edition >= StyleEdition::Edition2027 && s.is_empty() { + return; + } s.push('\n'); } +#[test] +fn append_newline_adds_newlines_before_2027() { + let mut text = String::new(); + append_newline(&mut text, StyleEdition::Edition2024); + assert_eq!(text, "\n"); +} + +#[test] +fn append_newline_leaves_empty_files_empty_in_2027() { + let mut text = String::new(); + append_newline(&mut text, StyleEdition::Edition2027); + assert!(text.is_empty()); +} + #[cfg(test)] pub(crate) fn write_all_files( source_file: &[FileRecord], diff --git a/src/test/mod.rs b/src/test/mod.rs index 291ac8fa078..48fe3227e6a 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -49,6 +49,8 @@ const FILE_SKIP_LIST: &[&str] = &[ "cfg_mod/bar.rs", "cfg_mod/foo.rs", "cfg_mod/wasm32.rs", + // Empty child modules with 2027-specific expectations. + "reorder_modules_2027", "skip/foo.rs", ]; @@ -484,6 +486,23 @@ fn self_tests() { assert_eq!(warnings, 0, "Rustfmt's code generated {warnings} warnings"); } +#[test] +fn reorder_modules_2027_tests() { + init_log(); + run_test_with(&TestSetting::default(), || { + let files = vec![ + PathBuf::from("tests/source/reorder_modules_2027/disabled_style_edition_2027.rs"), + PathBuf::from("tests/source/reorder_modules_2027/enabled_style_edition_2027.rs"), + PathBuf::from("tests/target/reorder_modules_2027/disabled_style_edition_2027.rs"), + PathBuf::from("tests/target/reorder_modules_2027/enabled_style_edition_2027.rs"), + ]; + let (_reports, count, fails) = check_files(files, &None); + + println!("Ran {count} reorder_modules_2027 tests."); + assert_eq!(fails, 0, "{fails} reorder_modules_2027 tests failed"); + }); +} + #[test] fn format_files_find_new_files_via_cfg_if() { init_log(); diff --git a/tests/config/empty_file_style_edition_2027.toml b/tests/config/empty_file_style_edition_2027.toml new file mode 100644 index 00000000000..9fe178ccbc2 --- /dev/null +++ b/tests/config/empty_file_style_edition_2027.toml @@ -0,0 +1 @@ +style_edition = "2027" diff --git a/tests/config/newline_file.toml b/tests/config/newline_file.toml new file mode 100644 index 00000000000..3501136812c --- /dev/null +++ b/tests/config/newline_file.toml @@ -0,0 +1 @@ +style_edition = "2024" diff --git a/tests/source/empty_file_style_edition_2027.rs b/tests/source/empty_file_style_edition_2027.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/newline_file.rs b/tests/source/newline_file.rs new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/tests/source/newline_file.rs @@ -0,0 +1 @@ + diff --git a/tests/source/reorder_modules_2027/A2/mod.rs b/tests/source/reorder_modules_2027/A2/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/ABCD/mod.rs b/tests/source/reorder_modules_2027/ABCD/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/ZYXW/mod.rs b/tests/source/reorder_modules_2027/ZYXW/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/ZYXW_/mod.rs b/tests/source/reorder_modules_2027/ZYXW_/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/ZY_XW/mod.rs b/tests/source/reorder_modules_2027/ZY_XW/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/Z_YXW/mod.rs b/tests/source/reorder_modules_2027/Z_YXW/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/_ZYXW/mod.rs b/tests/source/reorder_modules_2027/_ZYXW/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/_abcd/mod.rs b/tests/source/reorder_modules_2027/_abcd/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/a1/mod.rs b/tests/source/reorder_modules_2027/a1/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/abcde/mod.rs b/tests/source/reorder_modules_2027/abcde/mod.rs index 8b137891791..e69de29bb2d 100644 --- a/tests/source/reorder_modules_2027/abcde/mod.rs +++ b/tests/source/reorder_modules_2027/abcde/mod.rs @@ -1 +0,0 @@ - diff --git a/tests/source/reorder_modules/disabled_style_edition_2027.rs b/tests/source/reorder_modules_2027/disabled_style_edition_2027.rs similarity index 100% rename from tests/source/reorder_modules/disabled_style_edition_2027.rs rename to tests/source/reorder_modules_2027/disabled_style_edition_2027.rs diff --git a/tests/source/reorder_modules/enabled_style_edition_2027.rs b/tests/source/reorder_modules_2027/enabled_style_edition_2027.rs similarity index 100% rename from tests/source/reorder_modules/enabled_style_edition_2027.rs rename to tests/source/reorder_modules_2027/enabled_style_edition_2027.rs diff --git a/tests/source/reorder_modules_2027/u128/mod.rs b/tests/source/reorder_modules_2027/u128/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/u16/mod.rs b/tests/source/reorder_modules_2027/u16/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/u256/mod.rs b/tests/source/reorder_modules_2027/u256/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/u32/mod.rs b/tests/source/reorder_modules_2027/u32/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/u64/mod.rs b/tests/source/reorder_modules_2027/u64/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/u8/mod.rs b/tests/source/reorder_modules_2027/u8/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/u_zzz/mod.rs b/tests/source/reorder_modules_2027/u_zzz/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/ua/mod.rs b/tests/source/reorder_modules_2027/ua/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/usize/mod.rs b/tests/source/reorder_modules_2027/usize/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/uz/mod.rs b/tests/source/reorder_modules_2027/uz/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v0/mod.rs b/tests/source/reorder_modules_2027/v0/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v00/mod.rs b/tests/source/reorder_modules_2027/v00/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v000/mod.rs b/tests/source/reorder_modules_2027/v000/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v001/mod.rs b/tests/source/reorder_modules_2027/v001/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v009/mod.rs b/tests/source/reorder_modules_2027/v009/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v00t/mod.rs b/tests/source/reorder_modules_2027/v00t/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v01/mod.rs b/tests/source/reorder_modules_2027/v01/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v010/mod.rs b/tests/source/reorder_modules_2027/v010/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v09/mod.rs b/tests/source/reorder_modules_2027/v09/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v0s/mod.rs b/tests/source/reorder_modules_2027/v0s/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v0u/mod.rs b/tests/source/reorder_modules_2027/v0u/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v1/mod.rs b/tests/source/reorder_modules_2027/v1/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v10/mod.rs b/tests/source/reorder_modules_2027/v10/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/v9/mod.rs b/tests/source/reorder_modules_2027/v9/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/w005s09t/mod.rs b/tests/source/reorder_modules_2027/w005s09t/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/w5s009t/mod.rs b/tests/source/reorder_modules_2027/w5s009t/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/x64/mod.rs b/tests/source/reorder_modules_2027/x64/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/x86/mod.rs b/tests/source/reorder_modules_2027/x86/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/x86_128/mod.rs b/tests/source/reorder_modules_2027/x86_128/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/x86_32/mod.rs b/tests/source/reorder_modules_2027/x86_32/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/x86_64/mod.rs b/tests/source/reorder_modules_2027/x86_64/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/x87/mod.rs b/tests/source/reorder_modules_2027/x87/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/source/reorder_modules_2027/zyxwv/mod.rs b/tests/source/reorder_modules_2027/zyxwv/mod.rs index 8b137891791..e69de29bb2d 100644 --- a/tests/source/reorder_modules_2027/zyxwv/mod.rs +++ b/tests/source/reorder_modules_2027/zyxwv/mod.rs @@ -1 +0,0 @@ - diff --git a/tests/target/empty_file_style_edition_2027.rs b/tests/target/empty_file_style_edition_2027.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/newline_file.rs b/tests/target/newline_file.rs new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/tests/target/newline_file.rs @@ -0,0 +1 @@ + diff --git a/tests/target/reorder_modules_2027/A2/mod.rs b/tests/target/reorder_modules_2027/A2/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/ABCD/mod.rs b/tests/target/reorder_modules_2027/ABCD/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/ZYXW/mod.rs b/tests/target/reorder_modules_2027/ZYXW/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/ZYXW_/mod.rs b/tests/target/reorder_modules_2027/ZYXW_/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/ZY_XW/mod.rs b/tests/target/reorder_modules_2027/ZY_XW/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/Z_YXW/mod.rs b/tests/target/reorder_modules_2027/Z_YXW/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/_ZYXW/mod.rs b/tests/target/reorder_modules_2027/_ZYXW/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/_abcd/mod.rs b/tests/target/reorder_modules_2027/_abcd/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/a1/mod.rs b/tests/target/reorder_modules_2027/a1/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/abcde/mod.rs b/tests/target/reorder_modules_2027/abcde/mod.rs index 8b137891791..e69de29bb2d 100644 --- a/tests/target/reorder_modules_2027/abcde/mod.rs +++ b/tests/target/reorder_modules_2027/abcde/mod.rs @@ -1 +0,0 @@ - diff --git a/tests/target/reorder_modules/disabled_style_edition_2027.rs b/tests/target/reorder_modules_2027/disabled_style_edition_2027.rs similarity index 100% rename from tests/target/reorder_modules/disabled_style_edition_2027.rs rename to tests/target/reorder_modules_2027/disabled_style_edition_2027.rs diff --git a/tests/target/reorder_modules/enabled_style_edition_2027.rs b/tests/target/reorder_modules_2027/enabled_style_edition_2027.rs similarity index 100% rename from tests/target/reorder_modules/enabled_style_edition_2027.rs rename to tests/target/reorder_modules_2027/enabled_style_edition_2027.rs diff --git a/tests/target/reorder_modules_2027/u128/mod.rs b/tests/target/reorder_modules_2027/u128/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/u16/mod.rs b/tests/target/reorder_modules_2027/u16/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/u256/mod.rs b/tests/target/reorder_modules_2027/u256/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/u32/mod.rs b/tests/target/reorder_modules_2027/u32/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/u64/mod.rs b/tests/target/reorder_modules_2027/u64/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/u8/mod.rs b/tests/target/reorder_modules_2027/u8/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/u_zzz/mod.rs b/tests/target/reorder_modules_2027/u_zzz/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/ua/mod.rs b/tests/target/reorder_modules_2027/ua/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/usize/mod.rs b/tests/target/reorder_modules_2027/usize/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/uz/mod.rs b/tests/target/reorder_modules_2027/uz/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v0/mod.rs b/tests/target/reorder_modules_2027/v0/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v00/mod.rs b/tests/target/reorder_modules_2027/v00/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v000/mod.rs b/tests/target/reorder_modules_2027/v000/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v001/mod.rs b/tests/target/reorder_modules_2027/v001/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v009/mod.rs b/tests/target/reorder_modules_2027/v009/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v00t/mod.rs b/tests/target/reorder_modules_2027/v00t/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v01/mod.rs b/tests/target/reorder_modules_2027/v01/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v010/mod.rs b/tests/target/reorder_modules_2027/v010/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v09/mod.rs b/tests/target/reorder_modules_2027/v09/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v0s/mod.rs b/tests/target/reorder_modules_2027/v0s/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v0u/mod.rs b/tests/target/reorder_modules_2027/v0u/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v1/mod.rs b/tests/target/reorder_modules_2027/v1/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v10/mod.rs b/tests/target/reorder_modules_2027/v10/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/v9/mod.rs b/tests/target/reorder_modules_2027/v9/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/w005s09t/mod.rs b/tests/target/reorder_modules_2027/w005s09t/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/w5s009t/mod.rs b/tests/target/reorder_modules_2027/w5s009t/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/x64/mod.rs b/tests/target/reorder_modules_2027/x64/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/x86/mod.rs b/tests/target/reorder_modules_2027/x86/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/x86_128/mod.rs b/tests/target/reorder_modules_2027/x86_128/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/x86_32/mod.rs b/tests/target/reorder_modules_2027/x86_32/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/x86_64/mod.rs b/tests/target/reorder_modules_2027/x86_64/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/x87/mod.rs b/tests/target/reorder_modules_2027/x87/mod.rs new file mode 100644 index 00000000000..e69de29bb2d diff --git a/tests/target/reorder_modules_2027/zyxwv/mod.rs b/tests/target/reorder_modules_2027/zyxwv/mod.rs index 8b137891791..e69de29bb2d 100644 --- a/tests/target/reorder_modules_2027/zyxwv/mod.rs +++ b/tests/target/reorder_modules_2027/zyxwv/mod.rs @@ -1 +0,0 @@ - From 98e8100960b5c866c5791bb00ee6f80bfa9478f0 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Fri, 12 Jun 2026 13:00:09 -0400 Subject: [PATCH 2/5] Nightly for whitespace style edition 2027 tests --- src/test/mod.rs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/test/mod.rs b/src/test/mod.rs index 48fe3227e6a..063ee26f421 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -49,6 +49,8 @@ const FILE_SKIP_LIST: &[&str] = &[ "cfg_mod/bar.rs", "cfg_mod/foo.rs", "cfg_mod/wasm32.rs", + // Empty files cannot declare nightly-only 2027 style edition inline. + "empty_file_style_edition_2027.rs", // Empty child modules with 2027-specific expectations. "reorder_modules_2027", "skip/foo.rs", @@ -486,6 +488,26 @@ fn self_tests() { assert_eq!(warnings, 0, "Rustfmt's code generated {warnings} warnings"); } +#[nightly_only_test] +#[test] +fn empty_file_style_edition_2027_tests() { + init_log(); + run_test_with(&TestSetting::default(), || { + let files = vec![ + PathBuf::from("tests/source/empty_file_style_edition_2027.rs"), + PathBuf::from("tests/target/empty_file_style_edition_2027.rs"), + ]; + let (_reports, count, fails) = check_files(files, &None); + + println!("Ran {count} empty_file_style_edition_2027 tests."); + assert_eq!( + fails, 0, + "{fails} empty_file_style_edition_2027 tests failed" + ); + }); +} + +#[nightly_only_test] #[test] fn reorder_modules_2027_tests() { init_log(); From e4d6bdf609aefc510288b2affc0317da5959362b Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Fri, 12 Jun 2026 13:21:20 -0400 Subject: [PATCH 3/5] Remove reorder_modules_2027 --- src/test/mod.rs | 20 -------- tests/source/reorder_modules_2027/A2/mod.rs | 0 tests/source/reorder_modules_2027/ABCD/mod.rs | 0 tests/source/reorder_modules_2027/ZYXW/mod.rs | 0 .../source/reorder_modules_2027/ZYXW_/mod.rs | 0 .../source/reorder_modules_2027/ZY_XW/mod.rs | 0 .../source/reorder_modules_2027/Z_YXW/mod.rs | 0 .../source/reorder_modules_2027/_ZYXW/mod.rs | 0 .../source/reorder_modules_2027/_abcd/mod.rs | 0 tests/source/reorder_modules_2027/a1/mod.rs | 0 .../source/reorder_modules_2027/abcde/mod.rs | 0 .../disabled_style_edition_2027.rs | 47 ------------------- .../enabled_style_edition_2027.rs | 47 ------------------- tests/source/reorder_modules_2027/u128/mod.rs | 0 tests/source/reorder_modules_2027/u16/mod.rs | 0 tests/source/reorder_modules_2027/u256/mod.rs | 0 tests/source/reorder_modules_2027/u32/mod.rs | 0 tests/source/reorder_modules_2027/u64/mod.rs | 0 tests/source/reorder_modules_2027/u8/mod.rs | 0 .../source/reorder_modules_2027/u_zzz/mod.rs | 0 tests/source/reorder_modules_2027/ua/mod.rs | 0 .../source/reorder_modules_2027/usize/mod.rs | 0 tests/source/reorder_modules_2027/uz/mod.rs | 0 tests/source/reorder_modules_2027/v0/mod.rs | 0 tests/source/reorder_modules_2027/v00/mod.rs | 0 tests/source/reorder_modules_2027/v000/mod.rs | 0 tests/source/reorder_modules_2027/v001/mod.rs | 0 tests/source/reorder_modules_2027/v009/mod.rs | 0 tests/source/reorder_modules_2027/v00t/mod.rs | 0 tests/source/reorder_modules_2027/v01/mod.rs | 0 tests/source/reorder_modules_2027/v010/mod.rs | 0 tests/source/reorder_modules_2027/v09/mod.rs | 0 tests/source/reorder_modules_2027/v0s/mod.rs | 0 tests/source/reorder_modules_2027/v0u/mod.rs | 0 tests/source/reorder_modules_2027/v1/mod.rs | 0 tests/source/reorder_modules_2027/v10/mod.rs | 0 tests/source/reorder_modules_2027/v9/mod.rs | 0 .../reorder_modules_2027/w005s09t/mod.rs | 0 .../reorder_modules_2027/w5s009t/mod.rs | 0 tests/source/reorder_modules_2027/x64/mod.rs | 0 tests/source/reorder_modules_2027/x86/mod.rs | 0 .../reorder_modules_2027/x86_128/mod.rs | 0 .../source/reorder_modules_2027/x86_32/mod.rs | 0 .../source/reorder_modules_2027/x86_64/mod.rs | 0 tests/source/reorder_modules_2027/x87/mod.rs | 0 .../source/reorder_modules_2027/zyxwv/mod.rs | 0 tests/target/reorder_modules_2027/A2/mod.rs | 0 tests/target/reorder_modules_2027/ABCD/mod.rs | 0 tests/target/reorder_modules_2027/ZYXW/mod.rs | 0 .../target/reorder_modules_2027/ZYXW_/mod.rs | 0 .../target/reorder_modules_2027/ZY_XW/mod.rs | 0 .../target/reorder_modules_2027/Z_YXW/mod.rs | 0 .../target/reorder_modules_2027/_ZYXW/mod.rs | 0 .../target/reorder_modules_2027/_abcd/mod.rs | 0 tests/target/reorder_modules_2027/a1/mod.rs | 0 .../target/reorder_modules_2027/abcde/mod.rs | 0 .../disabled_style_edition_2027.rs | 47 ------------------- .../enabled_style_edition_2027.rs | 47 ------------------- tests/target/reorder_modules_2027/u128/mod.rs | 0 tests/target/reorder_modules_2027/u16/mod.rs | 0 tests/target/reorder_modules_2027/u256/mod.rs | 0 tests/target/reorder_modules_2027/u32/mod.rs | 0 tests/target/reorder_modules_2027/u64/mod.rs | 0 tests/target/reorder_modules_2027/u8/mod.rs | 0 .../target/reorder_modules_2027/u_zzz/mod.rs | 0 tests/target/reorder_modules_2027/ua/mod.rs | 0 .../target/reorder_modules_2027/usize/mod.rs | 0 tests/target/reorder_modules_2027/uz/mod.rs | 0 tests/target/reorder_modules_2027/v0/mod.rs | 0 tests/target/reorder_modules_2027/v00/mod.rs | 0 tests/target/reorder_modules_2027/v000/mod.rs | 0 tests/target/reorder_modules_2027/v001/mod.rs | 0 tests/target/reorder_modules_2027/v009/mod.rs | 0 tests/target/reorder_modules_2027/v00t/mod.rs | 0 tests/target/reorder_modules_2027/v01/mod.rs | 0 tests/target/reorder_modules_2027/v010/mod.rs | 0 tests/target/reorder_modules_2027/v09/mod.rs | 0 tests/target/reorder_modules_2027/v0s/mod.rs | 0 tests/target/reorder_modules_2027/v0u/mod.rs | 0 tests/target/reorder_modules_2027/v1/mod.rs | 0 tests/target/reorder_modules_2027/v10/mod.rs | 0 tests/target/reorder_modules_2027/v9/mod.rs | 0 .../reorder_modules_2027/w005s09t/mod.rs | 0 .../reorder_modules_2027/w5s009t/mod.rs | 0 tests/target/reorder_modules_2027/x64/mod.rs | 0 tests/target/reorder_modules_2027/x86/mod.rs | 0 .../reorder_modules_2027/x86_128/mod.rs | 0 .../target/reorder_modules_2027/x86_32/mod.rs | 0 .../target/reorder_modules_2027/x86_64/mod.rs | 0 tests/target/reorder_modules_2027/x87/mod.rs | 0 .../target/reorder_modules_2027/zyxwv/mod.rs | 0 91 files changed, 208 deletions(-) delete mode 100644 tests/source/reorder_modules_2027/A2/mod.rs delete mode 100644 tests/source/reorder_modules_2027/ABCD/mod.rs delete mode 100644 tests/source/reorder_modules_2027/ZYXW/mod.rs delete mode 100644 tests/source/reorder_modules_2027/ZYXW_/mod.rs delete mode 100644 tests/source/reorder_modules_2027/ZY_XW/mod.rs delete mode 100644 tests/source/reorder_modules_2027/Z_YXW/mod.rs delete mode 100644 tests/source/reorder_modules_2027/_ZYXW/mod.rs delete mode 100644 tests/source/reorder_modules_2027/_abcd/mod.rs delete mode 100644 tests/source/reorder_modules_2027/a1/mod.rs delete mode 100644 tests/source/reorder_modules_2027/abcde/mod.rs delete mode 100644 tests/source/reorder_modules_2027/disabled_style_edition_2027.rs delete mode 100644 tests/source/reorder_modules_2027/enabled_style_edition_2027.rs delete mode 100644 tests/source/reorder_modules_2027/u128/mod.rs delete mode 100644 tests/source/reorder_modules_2027/u16/mod.rs delete mode 100644 tests/source/reorder_modules_2027/u256/mod.rs delete mode 100644 tests/source/reorder_modules_2027/u32/mod.rs delete mode 100644 tests/source/reorder_modules_2027/u64/mod.rs delete mode 100644 tests/source/reorder_modules_2027/u8/mod.rs delete mode 100644 tests/source/reorder_modules_2027/u_zzz/mod.rs delete mode 100644 tests/source/reorder_modules_2027/ua/mod.rs delete mode 100644 tests/source/reorder_modules_2027/usize/mod.rs delete mode 100644 tests/source/reorder_modules_2027/uz/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v0/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v00/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v000/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v001/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v009/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v00t/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v01/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v010/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v09/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v0s/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v0u/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v1/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v10/mod.rs delete mode 100644 tests/source/reorder_modules_2027/v9/mod.rs delete mode 100644 tests/source/reorder_modules_2027/w005s09t/mod.rs delete mode 100644 tests/source/reorder_modules_2027/w5s009t/mod.rs delete mode 100644 tests/source/reorder_modules_2027/x64/mod.rs delete mode 100644 tests/source/reorder_modules_2027/x86/mod.rs delete mode 100644 tests/source/reorder_modules_2027/x86_128/mod.rs delete mode 100644 tests/source/reorder_modules_2027/x86_32/mod.rs delete mode 100644 tests/source/reorder_modules_2027/x86_64/mod.rs delete mode 100644 tests/source/reorder_modules_2027/x87/mod.rs delete mode 100644 tests/source/reorder_modules_2027/zyxwv/mod.rs delete mode 100644 tests/target/reorder_modules_2027/A2/mod.rs delete mode 100644 tests/target/reorder_modules_2027/ABCD/mod.rs delete mode 100644 tests/target/reorder_modules_2027/ZYXW/mod.rs delete mode 100644 tests/target/reorder_modules_2027/ZYXW_/mod.rs delete mode 100644 tests/target/reorder_modules_2027/ZY_XW/mod.rs delete mode 100644 tests/target/reorder_modules_2027/Z_YXW/mod.rs delete mode 100644 tests/target/reorder_modules_2027/_ZYXW/mod.rs delete mode 100644 tests/target/reorder_modules_2027/_abcd/mod.rs delete mode 100644 tests/target/reorder_modules_2027/a1/mod.rs delete mode 100644 tests/target/reorder_modules_2027/abcde/mod.rs delete mode 100644 tests/target/reorder_modules_2027/disabled_style_edition_2027.rs delete mode 100644 tests/target/reorder_modules_2027/enabled_style_edition_2027.rs delete mode 100644 tests/target/reorder_modules_2027/u128/mod.rs delete mode 100644 tests/target/reorder_modules_2027/u16/mod.rs delete mode 100644 tests/target/reorder_modules_2027/u256/mod.rs delete mode 100644 tests/target/reorder_modules_2027/u32/mod.rs delete mode 100644 tests/target/reorder_modules_2027/u64/mod.rs delete mode 100644 tests/target/reorder_modules_2027/u8/mod.rs delete mode 100644 tests/target/reorder_modules_2027/u_zzz/mod.rs delete mode 100644 tests/target/reorder_modules_2027/ua/mod.rs delete mode 100644 tests/target/reorder_modules_2027/usize/mod.rs delete mode 100644 tests/target/reorder_modules_2027/uz/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v0/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v00/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v000/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v001/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v009/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v00t/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v01/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v010/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v09/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v0s/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v0u/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v1/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v10/mod.rs delete mode 100644 tests/target/reorder_modules_2027/v9/mod.rs delete mode 100644 tests/target/reorder_modules_2027/w005s09t/mod.rs delete mode 100644 tests/target/reorder_modules_2027/w5s009t/mod.rs delete mode 100644 tests/target/reorder_modules_2027/x64/mod.rs delete mode 100644 tests/target/reorder_modules_2027/x86/mod.rs delete mode 100644 tests/target/reorder_modules_2027/x86_128/mod.rs delete mode 100644 tests/target/reorder_modules_2027/x86_32/mod.rs delete mode 100644 tests/target/reorder_modules_2027/x86_64/mod.rs delete mode 100644 tests/target/reorder_modules_2027/x87/mod.rs delete mode 100644 tests/target/reorder_modules_2027/zyxwv/mod.rs diff --git a/src/test/mod.rs b/src/test/mod.rs index 063ee26f421..99492b0d79d 100644 --- a/src/test/mod.rs +++ b/src/test/mod.rs @@ -51,8 +51,6 @@ const FILE_SKIP_LIST: &[&str] = &[ "cfg_mod/wasm32.rs", // Empty files cannot declare nightly-only 2027 style edition inline. "empty_file_style_edition_2027.rs", - // Empty child modules with 2027-specific expectations. - "reorder_modules_2027", "skip/foo.rs", ]; @@ -507,24 +505,6 @@ fn empty_file_style_edition_2027_tests() { }); } -#[nightly_only_test] -#[test] -fn reorder_modules_2027_tests() { - init_log(); - run_test_with(&TestSetting::default(), || { - let files = vec![ - PathBuf::from("tests/source/reorder_modules_2027/disabled_style_edition_2027.rs"), - PathBuf::from("tests/source/reorder_modules_2027/enabled_style_edition_2027.rs"), - PathBuf::from("tests/target/reorder_modules_2027/disabled_style_edition_2027.rs"), - PathBuf::from("tests/target/reorder_modules_2027/enabled_style_edition_2027.rs"), - ]; - let (_reports, count, fails) = check_files(files, &None); - - println!("Ran {count} reorder_modules_2027 tests."); - assert_eq!(fails, 0, "{fails} reorder_modules_2027 tests failed"); - }); -} - #[test] fn format_files_find_new_files_via_cfg_if() { init_log(); diff --git a/tests/source/reorder_modules_2027/A2/mod.rs b/tests/source/reorder_modules_2027/A2/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/ABCD/mod.rs b/tests/source/reorder_modules_2027/ABCD/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/ZYXW/mod.rs b/tests/source/reorder_modules_2027/ZYXW/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/ZYXW_/mod.rs b/tests/source/reorder_modules_2027/ZYXW_/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/ZY_XW/mod.rs b/tests/source/reorder_modules_2027/ZY_XW/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/Z_YXW/mod.rs b/tests/source/reorder_modules_2027/Z_YXW/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/_ZYXW/mod.rs b/tests/source/reorder_modules_2027/_ZYXW/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/_abcd/mod.rs b/tests/source/reorder_modules_2027/_abcd/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/a1/mod.rs b/tests/source/reorder_modules_2027/a1/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/abcde/mod.rs b/tests/source/reorder_modules_2027/abcde/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/disabled_style_edition_2027.rs b/tests/source/reorder_modules_2027/disabled_style_edition_2027.rs deleted file mode 100644 index 4695b06c77b..00000000000 --- a/tests/source/reorder_modules_2027/disabled_style_edition_2027.rs +++ /dev/null @@ -1,47 +0,0 @@ -// rustfmt-style_edition: 2027 -// rustfmt-reorder_modules: false - -mod x86; -mod v0s; -mod v001; -mod x87; -mod zyxwv; -mod A2; -mod ZYXW; -mod w5s009t; -mod u8; -mod x86_128; -mod _ZYXW; -mod ZY_XW; -mod a1; -mod v01; -mod v0u; -mod x86_64; -mod ua; -mod x86_32; -mod v9; -mod v010; -mod u_zzz; -mod v0; -mod v00; -mod v009; -mod w005s09t; -mod u32; -mod v1; -mod v00t; -mod v09; -mod u256; -mod ZY_XW; -mod _abcd; -mod ABCD; -mod Z_YXW; -mod u64; -mod abcde; -mod ZYXW_; -mod u16; -mod uz; -mod v10; -mod x64; -mod u128; -mod usize; -mod v000; diff --git a/tests/source/reorder_modules_2027/enabled_style_edition_2027.rs b/tests/source/reorder_modules_2027/enabled_style_edition_2027.rs deleted file mode 100644 index 6a81e9af742..00000000000 --- a/tests/source/reorder_modules_2027/enabled_style_edition_2027.rs +++ /dev/null @@ -1,47 +0,0 @@ -// rustfmt-style_edition: 2027 -// rustfmt-reorder_modules: true - -mod x86; -mod v0s; -mod v001; -mod x87; -mod zyxwv; -mod A2; -mod ZYXW; -mod w5s009t; -mod u8; -mod x86_128; -mod _ZYXW; -mod ZY_XW; -mod a1; -mod v01; -mod v0u; -mod x86_64; -mod ua; -mod x86_32; -mod v9; -mod v010; -mod u_zzz; -mod v0; -mod v00; -mod v009; -mod w005s09t; -mod u32; -mod v1; -mod v00t; -mod v09; -mod u256; -mod ZY_XW; -mod _abcd; -mod ABCD; -mod Z_YXW; -mod u64; -mod abcde; -mod ZYXW_; -mod u16; -mod uz; -mod v10; -mod x64; -mod u128; -mod usize; -mod v000; diff --git a/tests/source/reorder_modules_2027/u128/mod.rs b/tests/source/reorder_modules_2027/u128/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/u16/mod.rs b/tests/source/reorder_modules_2027/u16/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/u256/mod.rs b/tests/source/reorder_modules_2027/u256/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/u32/mod.rs b/tests/source/reorder_modules_2027/u32/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/u64/mod.rs b/tests/source/reorder_modules_2027/u64/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/u8/mod.rs b/tests/source/reorder_modules_2027/u8/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/u_zzz/mod.rs b/tests/source/reorder_modules_2027/u_zzz/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/ua/mod.rs b/tests/source/reorder_modules_2027/ua/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/usize/mod.rs b/tests/source/reorder_modules_2027/usize/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/uz/mod.rs b/tests/source/reorder_modules_2027/uz/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v0/mod.rs b/tests/source/reorder_modules_2027/v0/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v00/mod.rs b/tests/source/reorder_modules_2027/v00/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v000/mod.rs b/tests/source/reorder_modules_2027/v000/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v001/mod.rs b/tests/source/reorder_modules_2027/v001/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v009/mod.rs b/tests/source/reorder_modules_2027/v009/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v00t/mod.rs b/tests/source/reorder_modules_2027/v00t/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v01/mod.rs b/tests/source/reorder_modules_2027/v01/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v010/mod.rs b/tests/source/reorder_modules_2027/v010/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v09/mod.rs b/tests/source/reorder_modules_2027/v09/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v0s/mod.rs b/tests/source/reorder_modules_2027/v0s/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v0u/mod.rs b/tests/source/reorder_modules_2027/v0u/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v1/mod.rs b/tests/source/reorder_modules_2027/v1/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v10/mod.rs b/tests/source/reorder_modules_2027/v10/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/v9/mod.rs b/tests/source/reorder_modules_2027/v9/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/w005s09t/mod.rs b/tests/source/reorder_modules_2027/w005s09t/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/w5s009t/mod.rs b/tests/source/reorder_modules_2027/w5s009t/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/x64/mod.rs b/tests/source/reorder_modules_2027/x64/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/x86/mod.rs b/tests/source/reorder_modules_2027/x86/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/x86_128/mod.rs b/tests/source/reorder_modules_2027/x86_128/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/x86_32/mod.rs b/tests/source/reorder_modules_2027/x86_32/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/x86_64/mod.rs b/tests/source/reorder_modules_2027/x86_64/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/x87/mod.rs b/tests/source/reorder_modules_2027/x87/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/source/reorder_modules_2027/zyxwv/mod.rs b/tests/source/reorder_modules_2027/zyxwv/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/A2/mod.rs b/tests/target/reorder_modules_2027/A2/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/ABCD/mod.rs b/tests/target/reorder_modules_2027/ABCD/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/ZYXW/mod.rs b/tests/target/reorder_modules_2027/ZYXW/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/ZYXW_/mod.rs b/tests/target/reorder_modules_2027/ZYXW_/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/ZY_XW/mod.rs b/tests/target/reorder_modules_2027/ZY_XW/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/Z_YXW/mod.rs b/tests/target/reorder_modules_2027/Z_YXW/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/_ZYXW/mod.rs b/tests/target/reorder_modules_2027/_ZYXW/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/_abcd/mod.rs b/tests/target/reorder_modules_2027/_abcd/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/a1/mod.rs b/tests/target/reorder_modules_2027/a1/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/abcde/mod.rs b/tests/target/reorder_modules_2027/abcde/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/disabled_style_edition_2027.rs b/tests/target/reorder_modules_2027/disabled_style_edition_2027.rs deleted file mode 100644 index 4695b06c77b..00000000000 --- a/tests/target/reorder_modules_2027/disabled_style_edition_2027.rs +++ /dev/null @@ -1,47 +0,0 @@ -// rustfmt-style_edition: 2027 -// rustfmt-reorder_modules: false - -mod x86; -mod v0s; -mod v001; -mod x87; -mod zyxwv; -mod A2; -mod ZYXW; -mod w5s009t; -mod u8; -mod x86_128; -mod _ZYXW; -mod ZY_XW; -mod a1; -mod v01; -mod v0u; -mod x86_64; -mod ua; -mod x86_32; -mod v9; -mod v010; -mod u_zzz; -mod v0; -mod v00; -mod v009; -mod w005s09t; -mod u32; -mod v1; -mod v00t; -mod v09; -mod u256; -mod ZY_XW; -mod _abcd; -mod ABCD; -mod Z_YXW; -mod u64; -mod abcde; -mod ZYXW_; -mod u16; -mod uz; -mod v10; -mod x64; -mod u128; -mod usize; -mod v000; diff --git a/tests/target/reorder_modules_2027/enabled_style_edition_2027.rs b/tests/target/reorder_modules_2027/enabled_style_edition_2027.rs deleted file mode 100644 index bcca31f4023..00000000000 --- a/tests/target/reorder_modules_2027/enabled_style_edition_2027.rs +++ /dev/null @@ -1,47 +0,0 @@ -// rustfmt-style_edition: 2027 -// rustfmt-reorder_modules: true - -mod _ZYXW; -mod _abcd; -mod A2; -mod ABCD; -mod Z_YXW; -mod ZY_XW; -mod ZY_XW; -mod ZYXW; -mod ZYXW_; -mod a1; -mod abcde; -mod u_zzz; -mod u8; -mod u16; -mod u32; -mod u64; -mod u128; -mod u256; -mod ua; -mod usize; -mod uz; -mod v000; -mod v00; -mod v0; -mod v0s; -mod v00t; -mod v0u; -mod v001; -mod v01; -mod v1; -mod v009; -mod v09; -mod v9; -mod v010; -mod v10; -mod w005s09t; -mod w5s009t; -mod x64; -mod x86; -mod x86_32; -mod x86_64; -mod x86_128; -mod x87; -mod zyxwv; diff --git a/tests/target/reorder_modules_2027/u128/mod.rs b/tests/target/reorder_modules_2027/u128/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/u16/mod.rs b/tests/target/reorder_modules_2027/u16/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/u256/mod.rs b/tests/target/reorder_modules_2027/u256/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/u32/mod.rs b/tests/target/reorder_modules_2027/u32/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/u64/mod.rs b/tests/target/reorder_modules_2027/u64/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/u8/mod.rs b/tests/target/reorder_modules_2027/u8/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/u_zzz/mod.rs b/tests/target/reorder_modules_2027/u_zzz/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/ua/mod.rs b/tests/target/reorder_modules_2027/ua/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/usize/mod.rs b/tests/target/reorder_modules_2027/usize/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/uz/mod.rs b/tests/target/reorder_modules_2027/uz/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v0/mod.rs b/tests/target/reorder_modules_2027/v0/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v00/mod.rs b/tests/target/reorder_modules_2027/v00/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v000/mod.rs b/tests/target/reorder_modules_2027/v000/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v001/mod.rs b/tests/target/reorder_modules_2027/v001/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v009/mod.rs b/tests/target/reorder_modules_2027/v009/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v00t/mod.rs b/tests/target/reorder_modules_2027/v00t/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v01/mod.rs b/tests/target/reorder_modules_2027/v01/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v010/mod.rs b/tests/target/reorder_modules_2027/v010/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v09/mod.rs b/tests/target/reorder_modules_2027/v09/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v0s/mod.rs b/tests/target/reorder_modules_2027/v0s/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v0u/mod.rs b/tests/target/reorder_modules_2027/v0u/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v1/mod.rs b/tests/target/reorder_modules_2027/v1/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v10/mod.rs b/tests/target/reorder_modules_2027/v10/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/v9/mod.rs b/tests/target/reorder_modules_2027/v9/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/w005s09t/mod.rs b/tests/target/reorder_modules_2027/w005s09t/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/w5s009t/mod.rs b/tests/target/reorder_modules_2027/w5s009t/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/x64/mod.rs b/tests/target/reorder_modules_2027/x64/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/x86/mod.rs b/tests/target/reorder_modules_2027/x86/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/x86_128/mod.rs b/tests/target/reorder_modules_2027/x86_128/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/x86_32/mod.rs b/tests/target/reorder_modules_2027/x86_32/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/x86_64/mod.rs b/tests/target/reorder_modules_2027/x86_64/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/x87/mod.rs b/tests/target/reorder_modules_2027/x87/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/tests/target/reorder_modules_2027/zyxwv/mod.rs b/tests/target/reorder_modules_2027/zyxwv/mod.rs deleted file mode 100644 index e69de29bb2d..00000000000 From fc3bf206ba4b685a50e4bf649bf0abf5a3416492 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Fri, 12 Jun 2026 13:58:45 -0400 Subject: [PATCH 4/5] Restore reorder_modules 2027 tests from main --- .../disabled_style_edition_2027.rs | 50 +++++++++++++++++++ .../enabled_style_edition_2027.rs | 50 +++++++++++++++++++ .../source/reorder_modules_2027/abcde/mod.rs | 1 + .../source/reorder_modules_2027/zyxwv/mod.rs | 1 + .../disabled_style_edition_2027.rs | 50 +++++++++++++++++++ .../enabled_style_edition_2027.rs | 50 +++++++++++++++++++ .../target/reorder_modules_2027/abcde/mod.rs | 1 + .../target/reorder_modules_2027/zyxwv/mod.rs | 1 + 8 files changed, 204 insertions(+) create mode 100644 tests/source/reorder_modules/disabled_style_edition_2027.rs create mode 100644 tests/source/reorder_modules/enabled_style_edition_2027.rs create mode 100644 tests/source/reorder_modules_2027/abcde/mod.rs create mode 100644 tests/source/reorder_modules_2027/zyxwv/mod.rs create mode 100644 tests/target/reorder_modules/disabled_style_edition_2027.rs create mode 100644 tests/target/reorder_modules/enabled_style_edition_2027.rs create mode 100644 tests/target/reorder_modules_2027/abcde/mod.rs create mode 100644 tests/target/reorder_modules_2027/zyxwv/mod.rs diff --git a/tests/source/reorder_modules/disabled_style_edition_2027.rs b/tests/source/reorder_modules/disabled_style_edition_2027.rs new file mode 100644 index 00000000000..961ae135cef --- /dev/null +++ b/tests/source/reorder_modules/disabled_style_edition_2027.rs @@ -0,0 +1,50 @@ +// rustfmt-style_edition: 2027 +// rustfmt-reorder_modules: false +// Skip-children (nightly-only) because empty files changed format in 2027 +// rustfmt-unstable: true +// rustfmt-skip_children: true + +mod x86; +mod v0s; +mod v001; +mod x87; +mod zyxwv; +mod A2; +mod ZYXW; +mod w5s009t; +mod u8; +mod x86_128; +mod _ZYXW; +mod ZY_XW; +mod a1; +mod v01; +mod v0u; +mod x86_64; +mod ua; +mod x86_32; +mod v9; +mod v010; +mod u_zzz; +mod v0; +mod v00; +mod v009; +mod w005s09t; +mod u32; +mod v1; +mod v00t; +mod v09; +mod u256; +mod ZY_XW; +mod _abcd; +mod ABCD; +mod Z_YXW; +mod u64; +mod abcde; +mod ZYXW_; +mod u16; +mod uz; +mod v10; +mod x64; +mod u128; +mod usize; +mod v000; diff --git a/tests/source/reorder_modules/enabled_style_edition_2027.rs b/tests/source/reorder_modules/enabled_style_edition_2027.rs new file mode 100644 index 00000000000..f2ee7c94b7b --- /dev/null +++ b/tests/source/reorder_modules/enabled_style_edition_2027.rs @@ -0,0 +1,50 @@ +// rustfmt-style_edition: 2027 +// rustfmt-reorder_modules: true +// Skip-children (nightly-only) because empty files changed format in 2027 +// rustfmt-unstable: true +// rustfmt-skip_children: true + +mod x86; +mod v0s; +mod v001; +mod x87; +mod zyxwv; +mod A2; +mod ZYXW; +mod w5s009t; +mod u8; +mod x86_128; +mod _ZYXW; +mod ZY_XW; +mod a1; +mod v01; +mod v0u; +mod x86_64; +mod ua; +mod x86_32; +mod v9; +mod v010; +mod u_zzz; +mod v0; +mod v00; +mod v009; +mod w005s09t; +mod u32; +mod v1; +mod v00t; +mod v09; +mod u256; +mod ZY_XW; +mod _abcd; +mod ABCD; +mod Z_YXW; +mod u64; +mod abcde; +mod ZYXW_; +mod u16; +mod uz; +mod v10; +mod x64; +mod u128; +mod usize; +mod v000; diff --git a/tests/source/reorder_modules_2027/abcde/mod.rs b/tests/source/reorder_modules_2027/abcde/mod.rs new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/tests/source/reorder_modules_2027/abcde/mod.rs @@ -0,0 +1 @@ + diff --git a/tests/source/reorder_modules_2027/zyxwv/mod.rs b/tests/source/reorder_modules_2027/zyxwv/mod.rs new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/tests/source/reorder_modules_2027/zyxwv/mod.rs @@ -0,0 +1 @@ + diff --git a/tests/target/reorder_modules/disabled_style_edition_2027.rs b/tests/target/reorder_modules/disabled_style_edition_2027.rs new file mode 100644 index 00000000000..961ae135cef --- /dev/null +++ b/tests/target/reorder_modules/disabled_style_edition_2027.rs @@ -0,0 +1,50 @@ +// rustfmt-style_edition: 2027 +// rustfmt-reorder_modules: false +// Skip-children (nightly-only) because empty files changed format in 2027 +// rustfmt-unstable: true +// rustfmt-skip_children: true + +mod x86; +mod v0s; +mod v001; +mod x87; +mod zyxwv; +mod A2; +mod ZYXW; +mod w5s009t; +mod u8; +mod x86_128; +mod _ZYXW; +mod ZY_XW; +mod a1; +mod v01; +mod v0u; +mod x86_64; +mod ua; +mod x86_32; +mod v9; +mod v010; +mod u_zzz; +mod v0; +mod v00; +mod v009; +mod w005s09t; +mod u32; +mod v1; +mod v00t; +mod v09; +mod u256; +mod ZY_XW; +mod _abcd; +mod ABCD; +mod Z_YXW; +mod u64; +mod abcde; +mod ZYXW_; +mod u16; +mod uz; +mod v10; +mod x64; +mod u128; +mod usize; +mod v000; diff --git a/tests/target/reorder_modules/enabled_style_edition_2027.rs b/tests/target/reorder_modules/enabled_style_edition_2027.rs new file mode 100644 index 00000000000..3b23ac98115 --- /dev/null +++ b/tests/target/reorder_modules/enabled_style_edition_2027.rs @@ -0,0 +1,50 @@ +// rustfmt-style_edition: 2027 +// rustfmt-reorder_modules: true +// Skip-children (nightly-only) because empty files changed format in 2027 +// rustfmt-unstable: true +// rustfmt-skip_children: true + +mod _ZYXW; +mod _abcd; +mod A2; +mod ABCD; +mod Z_YXW; +mod ZY_XW; +mod ZY_XW; +mod ZYXW; +mod ZYXW_; +mod a1; +mod abcde; +mod u_zzz; +mod u8; +mod u16; +mod u32; +mod u64; +mod u128; +mod u256; +mod ua; +mod usize; +mod uz; +mod v000; +mod v00; +mod v0; +mod v0s; +mod v00t; +mod v0u; +mod v001; +mod v01; +mod v1; +mod v009; +mod v09; +mod v9; +mod v010; +mod v10; +mod w005s09t; +mod w5s009t; +mod x64; +mod x86; +mod x86_32; +mod x86_64; +mod x86_128; +mod x87; +mod zyxwv; diff --git a/tests/target/reorder_modules_2027/abcde/mod.rs b/tests/target/reorder_modules_2027/abcde/mod.rs new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/tests/target/reorder_modules_2027/abcde/mod.rs @@ -0,0 +1 @@ + diff --git a/tests/target/reorder_modules_2027/zyxwv/mod.rs b/tests/target/reorder_modules_2027/zyxwv/mod.rs new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/tests/target/reorder_modules_2027/zyxwv/mod.rs @@ -0,0 +1 @@ + From 90253f39f14ca95a163e7af35bd88eecfd640114 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Fri, 12 Jun 2026 14:15:24 -0400 Subject: [PATCH 5/5] Remove redundant unit tests --- src/source_file.rs | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/source_file.rs b/src/source_file.rs index e30534b8fae..401f8639172 100644 --- a/src/source_file.rs +++ b/src/source_file.rs @@ -23,20 +23,6 @@ pub(crate) fn append_newline(s: &mut String, style_edition: StyleEdition) { s.push('\n'); } -#[test] -fn append_newline_adds_newlines_before_2027() { - let mut text = String::new(); - append_newline(&mut text, StyleEdition::Edition2024); - assert_eq!(text, "\n"); -} - -#[test] -fn append_newline_leaves_empty_files_empty_in_2027() { - let mut text = String::new(); - append_newline(&mut text, StyleEdition::Edition2027); - assert!(text.is_empty()); -} - #[cfg(test)] pub(crate) fn write_all_files( source_file: &[FileRecord],