Merge pull request #8393 from cakebaker/od_improve_file_names

od: use underscores in filenames, adapt modules

src/uu/od/src/input_decoder.rs

@@ -2,13 +2,15 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-// spell-checker:ignore bfloat
+
+// spell-checker:ignore bfloat multifile
+
 use half::{bf16, f16};
 use std::io;
 
 use crate::byteorder_io::ByteOrder;
-use crate::multifilereader::HasError;
-use crate::peekreader::PeekRead;
+use crate::multifile_reader::HasError;
+use crate::peek_reader::PeekRead;
 
 /// Processes an input and provides access to the data read in various formats
 ///
@@ -169,7 +171,7 @@ impl MemoryDecoder<'_> {
 mod tests {
     use super::*;
     use crate::byteorder_io::ByteOrder;
-    use crate::peekreader::PeekReader;
+    use crate::peek_reader::PeekReader;
     use std::io::Cursor;
 
     #[test]

src/uu/od/src/od.rs

@@ -8,18 +8,18 @@
 // spell-checker:ignore Anone bfloat
 
 mod byteorder_io;
-mod formatteriteminfo;
-mod inputdecoder;
-mod inputoffset;
+mod formatter_item_info;
+mod input_decoder;
+mod input_offset;
 #[cfg(test)]
 mod mockstream;
-mod multifilereader;
+mod multifile_reader;
 mod output_info;
 mod parse_formats;
 mod parse_inputs;
 mod parse_nrofbytes;
-mod partialreader;
-mod peekreader;
+mod partial_reader;
+mod peek_reader;
 mod prn_char;
 mod prn_float;
 mod prn_int;
@@ -30,16 +30,16 @@ use std::fmt::Write;
 use std::io::BufReader;
 
 use crate::byteorder_io::ByteOrder;
-use crate::formatteriteminfo::FormatWriter;
-use crate::inputdecoder::{InputDecoder, MemoryDecoder};
-use crate::inputoffset::{InputOffset, Radix};
-use crate::multifilereader::{HasError, InputSource, MultifileReader};
+use crate::formatter_item_info::FormatWriter;
+use crate::input_decoder::{InputDecoder, MemoryDecoder};
+use crate::input_offset::{InputOffset, Radix};
+use crate::multifile_reader::{HasError, InputSource, MultifileReader};
 use crate::output_info::OutputInfo;
 use crate::parse_formats::{ParsedFormatterItemInfo, parse_format_flags};
 use crate::parse_inputs::{CommandLineInputs, parse_inputs};
 use crate::parse_nrofbytes::parse_number_of_bytes;
-use crate::partialreader::PartialReader;
-use crate::peekreader::{PeekRead, PeekReader};
+use crate::partial_reader::PartialReader;
+use crate::peek_reader::{PeekRead, PeekReader};
 use crate::prn_char::format_ascii_dump;
 use clap::ArgAction;
 use clap::{Arg, ArgMatches, Command, parser::ValueSource};

src/uu/od/src/output_info.rs

@@ -7,7 +7,7 @@
 use std::cmp;
 use std::slice::Iter;
 
-use crate::formatteriteminfo::FormatterItemInfo;
+use crate::formatter_item_info::FormatterItemInfo;
 use crate::parse_formats::ParsedFormatterItemInfo;
 
 /// Size in bytes of the max datatype. ie set to 16 for 128-bit numbers.

src/uu/od/src/parse_formats.rs

@@ -8,7 +8,7 @@ use std::collections::HashMap;
 use uucore::display::Quotable;
 use uucore::locale::{get_message, get_message_with_args};
 
-use crate::formatteriteminfo::FormatterItemInfo;
+use crate::formatter_item_info::FormatterItemInfo;
 use crate::prn_char::*;
 use crate::prn_float::*;
 use crate::prn_int::*;

src/uu/od/src/partial_reader.rs

@@ -2,13 +2,14 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-// spell-checker:ignore mockstream abcdefgh bcdefgh
+
+// spell-checker:ignore mockstream abcdefgh bcdefgh multifile
 
 use std::cmp;
 use std::io;
 use std::io::Read;
 
-use crate::multifilereader::HasError;
+use crate::multifile_reader::HasError;
 use uucore::locale::get_message;
 
 /// When a large number of bytes must be skipped, it will be read into a

src/uu/od/src/peek_reader.rs

@@ -2,14 +2,15 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-// spell-checker:ignore (ToDO) tempbuffer abcdefgh abcdefghij
+
+// spell-checker:ignore (ToDO) tempbuffer abcdefgh abcdefghij multifile
 
 //! Contains the trait `PeekRead` and type `PeekReader` implementing it.
 
 use std::io;
 use std::io::{Read, Write};
 
-use crate::multifilereader::HasError;
+use crate::multifile_reader::HasError;
 
 /// A trait which supplies a function to peek into a stream without
 /// actually reading it.

src/uu/od/src/prn_char.rs

@@ -3,7 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use crate::formatteriteminfo::{FormatWriter, FormatterItemInfo};
+use crate::formatter_item_info::{FormatWriter, FormatterItemInfo};
 
 pub static FORMAT_ITEM_A: FormatterItemInfo = FormatterItemInfo {
     byte_size: 1,

src/uu/od/src/prn_float.rs

@@ -5,7 +5,7 @@
 use half::f16;
 use std::num::FpCategory;
 
-use crate::formatteriteminfo::{FormatWriter, FormatterItemInfo};
+use crate::formatter_item_info::{FormatWriter, FormatterItemInfo};
 
 pub static FORMAT_ITEM_F16: FormatterItemInfo = FormatterItemInfo {
     byte_size: 2,

src/uu/od/src/prn_int.rs

@@ -2,7 +2,7 @@
 //
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
-use crate::formatteriteminfo::*;
+use crate::formatter_item_info::*;
 
 /// format string to print octal using `int_writer_unsigned`
 macro_rules! OCT {