From 937bf791e0da2137a4189b2e37bd3337449bccbd Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 14 Sep 2025 14:02:59 -0700
Subject: [PATCH] rust: Rename `test` modules to `tests` for consistency.

---
 rust/pspp/src/crypto.rs                            | 2 +-
 rust/pspp/src/format/display.rs                    | 2 +-
 rust/pspp/src/format/display/{test.rs => tests.rs} | 0
 rust/pspp/src/format/parse.rs                      | 2 +-
 rust/pspp/src/lex/scan.rs                          | 2 +-
 rust/pspp/src/lex/scan/{test.rs => tests.rs}       | 0
 rust/pspp/src/lex/segment.rs                       | 2 +-
 rust/pspp/src/lex/segment/{test.rs => tests.rs}    | 0
 rust/pspp/src/lex/token.rs                         | 2 +-
 rust/pspp/src/output/cairo.rs                      | 2 +-
 rust/pspp/src/output/pivot.rs                      | 4 ++--
 rust/pspp/src/output/pivot/look_xml.rs             | 2 +-
 rust/pspp/src/output/pivot/{test.rs => tests.rs}   | 0
 rust/pspp/src/output/pivot/tlo.rs                  | 2 +-
 rust/pspp/src/output/text.rs                       | 2 +-
 rust/pspp/src/output/text_line.rs                  | 2 +-
 rust/pspp/src/sys.rs                               | 2 +-
 rust/pspp/src/sys/sack.rs                          | 2 +-
 rust/pspp/src/sys/{test.rs => tests.rs}            | 2 +-
 19 files changed, 16 insertions(+), 16 deletions(-)
 rename rust/pspp/src/format/display/{test.rs => tests.rs} (100%)
 rename rust/pspp/src/lex/scan/{test.rs => tests.rs} (100%)
 rename rust/pspp/src/lex/segment/{test.rs => tests.rs} (100%)
 rename rust/pspp/src/output/pivot/{test.rs => tests.rs} (100%)
 rename rust/pspp/src/sys/{test.rs => tests.rs} (99%)

diff --git a/rust/pspp/src/crypto.rs b/rust/pspp/src/crypto.rs
index c2e86cdea1..0d1282f74c 100644
--- a/rust/pspp/src/crypto.rs
+++ b/rust/pspp/src/crypto.rs
@@ -581,7 +581,7 @@ impl EncodedPassword {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use std::{io::Cursor, path::Path};
 
     use crate::crypto::{EncodedPassword, EncryptedFile, FileType};
diff --git a/rust/pspp/src/format/display.rs b/rust/pspp/src/format/display.rs
index 5b3bbe2ccc..93cb275c9e 100644
--- a/rust/pspp/src/format/display.rs
+++ b/rust/pspp/src/format/display.rs
@@ -54,7 +54,7 @@ pub struct DisplayDatum<'b, B> {
 }
 
 #[cfg(test)]
-mod test;
+mod tests;
 
 pub trait DisplayPlain {
     fn display_plain(&self) -> DisplayPlainF64;
diff --git a/rust/pspp/src/format/display/test.rs b/rust/pspp/src/format/display/tests.rs
similarity index 100%
rename from rust/pspp/src/format/display/test.rs
rename to rust/pspp/src/format/display/tests.rs
diff --git a/rust/pspp/src/format/parse.rs b/rust/pspp/src/format/parse.rs
index f6a795ed2a..2161e3dc0a 100644
--- a/rust/pspp/src/format/parse.rs
+++ b/rust/pspp/src/format/parse.rs
@@ -910,7 +910,7 @@ fn nibble(b: u8) -> Result<u128, ParseErrorKind> {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use std::{
         fs::File,
         io::{BufRead, BufReader},
diff --git a/rust/pspp/src/lex/scan.rs b/rust/pspp/src/lex/scan.rs
index fcb1bc3416..4a3d2193f3 100644
--- a/rust/pspp/src/lex/scan.rs
+++ b/rust/pspp/src/lex/scan.rs
@@ -479,4 +479,4 @@ impl Iterator for StringScanner<'_> {
 }
 
 #[cfg(test)]
-mod test;
+mod tests;
diff --git a/rust/pspp/src/lex/scan/test.rs b/rust/pspp/src/lex/scan/tests.rs
similarity index 100%
rename from rust/pspp/src/lex/scan/test.rs
rename to rust/pspp/src/lex/scan/tests.rs
diff --git a/rust/pspp/src/lex/segment.rs b/rust/pspp/src/lex/segment.rs
index 5a568692b5..27313a7184 100644
--- a/rust/pspp/src/lex/segment.rs
+++ b/rust/pspp/src/lex/segment.rs
@@ -1439,4 +1439,4 @@ fn strip_prefix_ignore_ascii_case<'a>(line: &'a str, pattern: &str) -> Option<&'
 }
 
 #[cfg(test)]
-mod test;
+mod tests;
diff --git a/rust/pspp/src/lex/segment/test.rs b/rust/pspp/src/lex/segment/tests.rs
similarity index 100%
rename from rust/pspp/src/lex/segment/test.rs
rename to rust/pspp/src/lex/segment/tests.rs
diff --git a/rust/pspp/src/lex/token.rs b/rust/pspp/src/lex/token.rs
index 27cc2b1a55..be0cad9f87 100644
--- a/rust/pspp/src/lex/token.rs
+++ b/rust/pspp/src/lex/token.rs
@@ -159,7 +159,7 @@ impl Display for Token {
 
 /// Check that all negative numbers, even -0, get formatted with a leading `-`.
 #[cfg(test)]
-mod test {
+mod tests {
     use crate::lex::token::Token;
 
     #[test]
diff --git a/rust/pspp/src/output/cairo.rs b/rust/pspp/src/output/cairo.rs
index 0d6782f142..260e5c3e2c 100644
--- a/rust/pspp/src/output/cairo.rs
+++ b/rust/pspp/src/output/cairo.rs
@@ -42,7 +42,7 @@ fn horz_align_to_pango(horz_align: HorzAlign) -> pango::Alignment {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use crate::output::cairo::{CairoConfig, CairoDriver};
 
     #[test]
diff --git a/rust/pspp/src/output/pivot.rs b/rust/pspp/src/output/pivot.rs
index 92133e2c51..2c9f17b307 100644
--- a/rust/pspp/src/output/pivot.rs
+++ b/rust/pspp/src/output/pivot.rs
@@ -82,7 +82,7 @@ pub mod output;
 
 mod look_xml;
 #[cfg(test)]
-pub mod test;
+pub mod tests;
 mod tlo;
 
 /// Areas of a pivot table for styling purposes.
@@ -2775,7 +2775,7 @@ impl Serialize for MetadataEntry {
 }
 
 #[cfg(test)]
-mod tests {
+mod test {
     use crate::output::pivot::{Display26Adic, MetadataEntry, MetadataValue, Value};
 
     #[test]
diff --git a/rust/pspp/src/output/pivot/look_xml.rs b/rust/pspp/src/output/pivot/look_xml.rs
index adddcac90c..c935125e31 100644
--- a/rust/pspp/src/output/pivot/look_xml.rs
+++ b/rust/pspp/src/output/pivot/look_xml.rs
@@ -439,7 +439,7 @@ impl<'de> Deserialize<'de> for Dimension {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use std::str::FromStr;
 
     use quick_xml::de::from_str;
diff --git a/rust/pspp/src/output/pivot/test.rs b/rust/pspp/src/output/pivot/tests.rs
similarity index 100%
rename from rust/pspp/src/output/pivot/test.rs
rename to rust/pspp/src/output/pivot/tests.rs
diff --git a/rust/pspp/src/output/pivot/tlo.rs b/rust/pspp/src/output/pivot/tlo.rs
index b51e551461..dfa292c911 100644
--- a/rust/pspp/src/output/pivot/tlo.rs
+++ b/rust/pspp/src/output/pivot/tlo.rs
@@ -560,7 +560,7 @@ impl Debug for U8String {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use crate::output::pivot::tlo::parse_tlo;
 
     #[test]
diff --git a/rust/pspp/src/output/text.rs b/rust/pspp/src/output/text.rs
index af00cfcc68..147f475d53 100644
--- a/rust/pspp/src/output/text.rs
+++ b/rust/pspp/src/output/text.rs
@@ -652,7 +652,7 @@ impl Device for TextRenderer {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
 
     use crate::output::text::new_line_breaks;
diff --git a/rust/pspp/src/output/text_line.rs b/rust/pspp/src/output/text_line.rs
index 2911b63bc4..e4d7c5c370 100644
--- a/rust/pspp/src/output/text_line.rs
+++ b/rust/pspp/src/output/text_line.rs
@@ -330,7 +330,7 @@ pub fn clip_text<'a>(
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use super::{Emphasis, TextLine};
     use enum_iterator::all;
 
diff --git a/rust/pspp/src/sys.rs b/rust/pspp/src/sys.rs
index 4f59614100..1746781d69 100644
--- a/rust/pspp/src/sys.rs
+++ b/rust/pspp/src/sys.rs
@@ -42,7 +42,7 @@ use serde::Serializer;
 pub use write::{SystemFileVersion, WriteOptions, Writer};
 
 #[cfg(test)]
-mod test;
+mod tests;
 
 fn serialize_endian<S>(endian: &Endian, serializer: S) -> Result<S::Ok, S::Error>
 where
diff --git a/rust/pspp/src/sys/sack.rs b/rust/pspp/src/sys/sack.rs
index b23d0d83ea..348fda6bf5 100644
--- a/rust/pspp/src/sys/sack.rs
+++ b/rust/pspp/src/sys/sack.rs
@@ -573,7 +573,7 @@ impl<'a> Lexer<'a> {
 }
 
 #[cfg(test)]
-mod test {
+mod tests {
     use crate::sys::sack::sack;
     use anyhow::Result;
     use binrw::Endian;
diff --git a/rust/pspp/src/sys/test.rs b/rust/pspp/src/sys/tests.rs
similarity index 99%
rename from rust/pspp/src/sys/test.rs
rename to rust/pspp/src/sys/tests.rs
index 9198a71e94..64750fed06 100644
--- a/rust/pspp/src/sys/test.rs
+++ b/rust/pspp/src/sys/tests.rs
@@ -31,7 +31,7 @@ use crate::{
     dictionary::Dictionary,
     identifier::Identifier,
     output::{
-        pivot::{test::assert_lines_eq, Axis3, Dimension, Group, PivotTable, Value},
+        pivot::{tests::assert_lines_eq, Axis3, Dimension, Group, PivotTable, Value},
         Details, Item, Text,
     },
     sys::{
-- 
2.30.2