match against `Stream` `HttpRead()`, `InputFile(_)` and `NamedTcp(_)` variants in...

Signed-off-by: Thierry Marianne <[email protected]>

diff --git a/src/machine/machine_state.rs b/src/machine/machine_state.rs
index 237fafbb7532badda1cc0b37ecc417139e319047..e1124222ae1da20d390efc476208ed90b3f54835 100644 (file)
--- a/src/machine/machine_state.rs
+++ b/src/machine/machine_state.rs
@@ -755,30 +755,24 @@ impl MachineState {
             );
         }
 
-        #[cfg(feature = "http")]
-        if let Stream::HttpRead(_) = stream {
-            return self.read_term(
-                stream,
-                indices,
-                MachineState::read_term_from_user_input_eof_handler,
-            );
-        }
-
-        if let Stream::InputFile(_) = stream {
-            return self.read_term(
-                stream,
-                indices,
-                MachineState::read_term_from_user_input_eof_handler,
-            );
-        }
-
-        if let Stream::NamedTcp(_) = stream {
-            return self.read_term(
-                stream,
-                indices,
-                MachineState::read_term_from_user_input_eof_handler,
-            );
-        }
+        match stream {
+            #[cfg(feature = "http")]
+            Stream::HttpRead(_) => {
+                return self.read_term(
+                    stream,
+                    indices,
+                    MachineState::read_term_from_user_input_eof_handler,
+                )
+            }
+            Stream::InputFile(_) | Stream::NamedTcp(_) => {
+                return self.read_term(
+                    stream,
+                    indices,
+                    MachineState::read_term_from_user_input_eof_handler,
+                )
+            }
+            _ => true,
+        };
 
         if let Stream::Byte(_) = stream {
             return self.read_term(

diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs
index 01f2b2eceed66e93936292e6c2cabff8e537e1fd..baad01537933d2ccd843924e36f5ced72c21d3fe 100644 (file)
--- a/src/machine/system_calls.rs
+++ b/src/machine/system_calls.rs
@@ -6756,7 +6756,7 @@ impl Machine {
             Err(e) => {
                 match self.user_input {
                     Stream::Byte(_) | Stream::Readline(_) => self.user_input.reset(),
-                    _ => true
+                    _ => true,
                 };
                 Err(e)
             }