rename module

ReagentX · Mar 7, 2024 · b4d2ff5 · b4d2ff5
1 parent f512421
commit b4d2ff5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 19 deletions.
diff --git a/src/communication/handlers/command.rs b/src/communication/handlers/command.rs
@@ -6,7 +6,7 @@ use super::handler::Handler;
 use crate::{
     communication::{
         handlers::user_input::UserInputHandler,
-        input::{input_type::InputType, stream_type::StreamType},
+        input::{InputType, StreamType},
         reader::MainWindow,
     },
     ui::scroll::ScrollState,

diff --git a/src/communication/handlers/normal.rs b/src/communication/handlers/normal.rs
@@ -5,7 +5,7 @@ use crossterm::{cursor, event::KeyCode, queue, Result};
 use super::handler::Handler;
 use crate::{
     communication::{
-        input::{input_type::InputType, stream_type::StreamType},
+        input::{InputType, StreamType},
         reader::MainWindow,
     },
     ui::scroll,

diff --git a/src/communication/handlers/parser.rs b/src/communication/handlers/parser.rs
@@ -8,7 +8,7 @@ use crate::{
         handlers::{
             handler::Handler, multiple_choice::MultipleChoiceHandler, processor::ProcessorMethods,
         },
-        input::{input_type::InputType::Normal, stream_type::StreamType},
+        input::{InputType::Normal, StreamType},
         reader::MainWindow,
     },
     extensions::{
@@ -427,7 +427,7 @@ mod parse_tests {
     use crate::{
         communication::{
             handlers::{handler::Handler, parser::ParserState, processor::ProcessorMethods},
-            input::{input_type::InputType, stream_type::StreamType},
+            input::{InputType, StreamType},
             reader::MainWindow,
         },
         extensions::parser::{Parser, PatternType},
@@ -671,7 +671,7 @@ mod regex_tests {
                 handler::Handler, parser::ParserHandler, parser::ParserState,
                 processor::ProcessorMethods,
             },
-            input::{input_type::InputType, stream_type::StreamType},
+            input::{InputType, StreamType},
             reader::MainWindow,
         },
         extensions::parser::{Parser, PatternType},
@@ -840,7 +840,7 @@ mod split_tests {
     use crate::{
         communication::{
             handlers::{handler::Handler, parser::ParserState, processor::ProcessorMethods},
-            input::{input_type::InputType, stream_type::StreamType},
+            input::{InputType, StreamType},
             reader::MainWindow,
         },
         extensions::parser::{Parser, PatternType},
@@ -980,7 +980,7 @@ mod failure_tests {
     use crate::{
         communication::{
             handlers::{handler::Handler, parser::ParserState, processor::ProcessorMethods},
-            input::{input_type::InputType, stream_type::StreamType},
+            input::{InputType, StreamType},
             reader::MainWindow,
         },
         extensions::parser::{Parser, PatternType},

diff --git a/src/communication/handlers/regex.rs b/src/communication/handlers/regex.rs
@@ -4,8 +4,7 @@ use regex::bytes::Regex;
 use super::{handler::Handler, processor::ProcessorMethods};
 use crate::{
     communication::{
-        handlers::user_input::UserInputHandler, input::input_type::InputType::Normal,
-        reader::MainWindow,
+        handlers::user_input::UserInputHandler, input::InputType::Normal, reader::MainWindow,
     },
     constants::cli::{cli_chars::NORMAL_CHAR, patterns::ANSI_COLOR_PATTERN},
     ui::scroll,
@@ -169,7 +168,7 @@ mod tests {
 
     use crate::communication::{
         handlers::{handler::Handler, processor::ProcessorMethods},
-        input::input_type::InputType,
+        input::InputType,
         reader::MainWindow,
     };
 

diff --git a/src/communication/handlers/startup.rs b/src/communication/handlers/startup.rs
@@ -6,8 +6,7 @@ use super::{handler::Handler, user_input::UserInputHandler};
 use crate::{
     communication::{
         input::{
-            build_streams_from_input, build_streams_from_session, input_type::InputType,
-            stream_type::StreamType::StdErr,
+            build_streams_from_input, build_streams_from_session, InputType, StreamType::StdErr,
         },
         reader::MainWindow,
     },
@@ -149,7 +148,7 @@ mod startup_tests {
     use crate::{
         communication::{
             handlers::handler::Handler,
-            input::{input_type::InputType, stream_type::StreamType},
+            input::{InputType, StreamType},
             reader::MainWindow,
         },
         constants::cli::messages::START_MESSAGE,

diff --git a/src/communication/reader.rs b/src/communication/reader.rs
@@ -26,10 +26,7 @@ use crate::{
             regex::RegexHandler,
             startup::StartupHandler,
         },
-        input::{
-            build_streams_from_input, input_type::InputType, stream_type::StreamType,
-            streams::InputStream,
-        },
+        input::{build_streams_from_input, InputStream, InputType, StreamType},
     },
     constants::cli::{
         cli_chars, colors,
@@ -1016,7 +1013,7 @@ mod render_tests {
 
 #[cfg(test)]
 mod poll_rate_tests {
-    use crate::communication::{input::input_type::InputType, reader::MainWindow};
+    use crate::communication::{input::InputType, reader::MainWindow};
     use std::time::Duration;
 
     #[test]

diff --git a/src/ui/scroll.rs b/src/ui/scroll.rs
@@ -48,7 +48,7 @@ pub fn top(window: &mut MainWindow) {
 #[cfg(test)]
 mod tests {
     use crate::{
-        communication::{input::input_type::InputType::Regex, reader::MainWindow},
+        communication::{input::InputType::Regex, reader::MainWindow},
         ui::scroll,
     };