refactor: remove parent parser mod

josecelano · josecelano · commit a3c7c4bc7537 · 2024-12-04T10:46:30.000Z
diff --git a/examples/parser_file_in_file_out.rs b/examples/parser_file_in_file_out.rs
@@ -10,7 +10,7 @@ use std::{
     io::{Read, Write},
 };
 
-use bencode2json::parsers::generators::json::BencodeParser;
+use bencode2json::generators::json::BencodeParser;
 use clap::{Arg, Command};
 
 fn main() {
diff --git a/examples/parser_stdin_stdout.rs b/examples/parser_stdin_stdout.rs
@@ -7,7 +7,7 @@
 //! It prints "spam".
 use std::io;
 
-use bencode2json::parsers::generators::json::BencodeParser;
+use bencode2json::generators::json::BencodeParser;
 
 fn main() {
     let input = Box::new(io::stdin());
diff --git a/examples/parser_string_in_string_out.rs b/examples/parser_string_in_string_out.rs
@@ -5,7 +5,7 @@
 //! ```
 //!
 //! It prints "spam".
-use bencode2json::parsers::generators::json::BencodeParser;
+use bencode2json::generators::json::BencodeParser;
 
 fn main() {
     let input = "4:spam".to_string();
diff --git a/examples/parser_string_in_vec_out.rs b/examples/parser_string_in_vec_out.rs
@@ -5,7 +5,7 @@
 //! ```
 //!
 //! It prints "spam".
-use bencode2json::parsers::generators::json::BencodeParser;
+use bencode2json::generators::json::BencodeParser;
 
 fn main() {
     let input = "4:spam".to_string();
diff --git a/examples/parser_vec_in_string_out.rs b/examples/parser_vec_in_string_out.rs
@@ -5,7 +5,7 @@
 //! ```
 //!
 //! It prints "spam".
-use bencode2json::parsers::generators::json::BencodeParser;
+use bencode2json::generators::json::BencodeParser;
 
 fn main() {
     let input = b"4:spam".to_vec();
diff --git a/examples/parser_vec_in_vec_out.rs b/examples/parser_vec_in_vec_out.rs
@@ -5,7 +5,7 @@
 //! ```
 //!
 //! It prints "spam".
-use bencode2json::parsers::generators::json::BencodeParser;
+use bencode2json::generators::json::BencodeParser;
 
 fn main() {
     let input = b"4:spam".to_vec();
diff --git a/src/error.rs b/src/error.rs
@@ -197,7 +197,7 @@ impl fmt::Display for WriteContext {
 mod tests {
 
     mod for_read_context {
-        use crate::parsers::error::ReadContext;
+        use crate::error::ReadContext;
 
         #[test]
         fn it_should_display_the_read_context() {
@@ -237,7 +237,7 @@ mod tests {
     }
 
     mod for_write_context {
-        use crate::parsers::error::WriteContext;
+        use crate::error::WriteContext;
 
         #[test]
         fn it_should_display_the_read_context() {
diff --git a/src/generators/json.rs b/src/generators/json.rs
@@ -17,11 +17,9 @@ use super::{
 use tokenizer::{BencodeToken, Tokenizer};
 
 use crate::{
-    parsers::{
-        error::{self, ReadContext, WriteContext},
-        tokenizer,
-    },
+    error::{self, ReadContext, WriteContext},
     rw::{byte_writer::ByteWriter, string_writer::StringWriter, writer::Writer},
+    tokenizer,
 };
 
 pub struct BencodeParser<R: Read> {
@@ -355,10 +353,10 @@ mod tests {
 
     use std::io::{self, Read};
 
-    use crate::parsers::generators::json::BencodeParser;
+    use crate::generators::json::BencodeParser;
 
     mod it_should_allow_writing {
-        use crate::parsers::generators::json::BencodeParser;
+        use crate::generators::json::BencodeParser;
 
         #[test]
         fn to_any_type_implementing_io_write_trait() {
@@ -411,7 +409,7 @@ mod tests {
 
     mod it_should_allow_special_bencode_cases {
 
-        use crate::{parsers::generators::json::BencodeParser, test::bencode_to_json_unchecked};
+        use crate::{generators::json::BencodeParser, test::bencode_to_json_unchecked};
 
         #[test]
         fn an_empty_input() {
@@ -448,10 +446,7 @@ mod tests {
     mod it_should_fail {
         use std::io::{self, Read};
 
-        use crate::{
-            parsers::{error::Error, generators::json::BencodeParser},
-            try_bencode_to_json,
-        };
+        use crate::{error::Error, generators::json::BencodeParser, try_bencode_to_json};
 
         #[test]
         fn when_there_is_a_problem_reading_from_input() {
@@ -548,7 +543,7 @@ mod tests {
         }
 
         mod should_fail {
-            use crate::{parsers::error::Error, try_bencode_to_json};
+            use crate::{error::Error, try_bencode_to_json};
 
             #[test]
             fn when_it_finds_an_invalid_byte() {
@@ -754,7 +749,7 @@ mod tests {
         }
 
         mod it_should_fail_parsing_when {
-            use crate::{parsers::error::Error, try_bencode_to_json};
+            use crate::{error::Error, try_bencode_to_json};
 
             #[test]
             fn it_reaches_the_end_of_the_input_parsing_the_string_length() {
@@ -1327,7 +1322,7 @@ mod tests {
         }
 
         mod should_fail {
-            use crate::{parsers::error::Error, try_bencode_to_json};
+            use crate::{error::Error, try_bencode_to_json};
 
             #[test]
             fn when_an_empty_list_does_not_have_the_matching_close_byte() {
@@ -1920,7 +1915,7 @@ mod tests {
         }
 
         mod should_fail {
-            use crate::{parsers::error::Error, try_bencode_to_json};
+            use crate::{error::Error, try_bencode_to_json};
 
             #[test]
             fn when_an_empty_dict_does_not_have_the_matching_close_byte() {
@@ -1998,8 +1993,8 @@ mod tests {
             }
 
             mod when_the_field_key_is_not_a_string_for_example {
-                use crate::parsers::error::Error;
-                use crate::parsers::generators::json::BencodeType;
+                use crate::error::Error;
+                use crate::generators::json::BencodeType;
                 use crate::try_bencode_to_json;
 
                 #[test]
diff --git a/src/generators/mod.rs b/src/generators/mod.rs
diff --git a/src/generators/stack.rs b/src/generators/stack.rs
@@ -150,7 +150,7 @@ impl Stack {
 #[cfg(test)]
 mod tests {
     mod the_stack_state {
-        use crate::parsers::generators::stack::State;
+        use crate::generators::stack::State;
 
         #[test]
         fn should_be_displayed_with_single_letter_abbreviations() {
@@ -165,7 +165,7 @@ mod tests {
 
     mod the_stack {
         mod it_should {
-            use crate::parsers::generators::stack::{Stack, State};
+            use crate::generators::stack::{Stack, State};
 
             #[test]
             fn have_an_initial_state() {
@@ -235,7 +235,7 @@ mod tests {
 
             mod be_displayed_with_single_letter_abbreviations_for_states {
 
-                use crate::parsers::generators::stack::{Stack, State};
+                use crate::generators::stack::{Stack, State};
 
                 #[test]
                 fn with_the_initial_state() {
diff --git a/src/lib.rs b/src/lib.rs
@@ -34,10 +34,13 @@
 //!
 //! > __NOTICE__: In the context of this lib, parser is a function that takes an input
 //! > containing bencoded data and produces a JSON output (raw bytes or UTF-8 string).
-use parsers::{error::Error, generators::json::BencodeParser};
-
-pub mod parsers;
+pub mod error;
+pub mod generators;
 pub mod rw;
+pub mod tokenizer;
+
+use error::Error;
+use generators::json::BencodeParser;
 mod test;
 
 /// It converts bencoded bytes into a JSON string.
diff --git a/src/main.rs b/src/main.rs
@@ -13,7 +13,7 @@
 //! ```text
 //! cargo run -- -i ./tests/fixtures/sample.bencode -o output.json
 //! ```
-use bencode2json::parsers::generators::json::BencodeParser;
+use bencode2json::generators::json::BencodeParser;
 use clap::{Arg, Command};
 use std::fs::File;
 use std::io::{self, Read, Write};
diff --git a/src/parsers/mod.rs b/src/parsers/mod.rs
diff --git a/src/test.rs b/src/test.rs
@@ -8,7 +8,7 @@
 #[cfg(test)]
 #[must_use]
 pub(crate) fn bencode_to_json_unchecked(input_buffer: &[u8]) -> String {
-    use crate::parsers::generators::json::BencodeParser;
+    use crate::generators::json::BencodeParser;
 
     let mut output = String::new();
 
diff --git a/src/tokenizer/integer.rs b/src/tokenizer/integer.rs
@@ -134,7 +134,7 @@ fn next_byte<R: Read>(reader: &mut ByteReader<R>) -> Result<u8, Error> {
 
 #[cfg(test)]
 mod tests {
-    use crate::{parsers::error::Error, rw::byte_reader::ByteReader};
+    use crate::{error::Error, rw::byte_reader::ByteReader};
 
     use super::parse;
 
@@ -153,7 +153,7 @@ mod tests {
     }
 
     mod for_helpers {
-        use crate::parsers::tokenizer::integer::tests::try_bencode_to_json;
+        use crate::tokenizer::integer::tests::try_bencode_to_json;
 
         #[test]
         fn bencode_to_json_wrapper_succeeds() {
@@ -190,11 +190,9 @@ mod tests {
         use std::io::{self, Read};
 
         use crate::{
-            parsers::{
-                error::Error,
-                tokenizer::integer::{parse, tests::try_bencode_to_json},
-            },
+            error::Error,
             rw::byte_reader::ByteReader,
+            tokenizer::integer::{parse, tests::try_bencode_to_json},
         };
 
         #[test]
@@ -250,7 +248,7 @@ mod tests {
         }
 
         mod when_it_receives_a_unexpected_byte {
-            use crate::parsers::{error::Error, tokenizer::integer::tests::try_bencode_to_json};
+            use crate::{error::Error, tokenizer::integer::tests::try_bencode_to_json};
 
             #[test]
             fn while_expecting_a_digit_or_sign() {
diff --git a/src/tokenizer/mod.rs b/src/tokenizer/mod.rs
diff --git a/src/tokenizer/string.rs b/src/tokenizer/string.rs
@@ -210,7 +210,7 @@ impl Value {
 
 #[cfg(test)]
 mod tests {
-    use crate::{parsers::error::Error, rw::byte_reader::ByteReader};
+    use crate::{error::Error, rw::byte_reader::ByteReader};
 
     use super::parse;
 
@@ -228,7 +228,7 @@ mod tests {
     }
 
     mod for_helpers {
-        use crate::parsers::tokenizer::string::tests::try_bencode_to_json;
+        use crate::tokenizer::string::tests::try_bencode_to_json;
 
         #[test]
         fn bencode_to_json_wrapper_succeeds() {
@@ -356,11 +356,9 @@ mod tests {
         use std::io::{self, Read};
 
         use crate::{
-            parsers::{
-                error::Error,
-                tokenizer::string::{parse, tests::try_bencode_to_json},
-            },
+            error::Error,
             rw::byte_reader::ByteReader,
+            tokenizer::string::{parse, tests::try_bencode_to_json},
         };
 
         #[test]
