Fix issue in external subexpression paths (#3642)

* Fix issue in external subexpression paths

* new clippy dropped

* clippy

crates/nu-cli/src/app.rs

@@ -357,11 +357,11 @@ mod tests {
         let ui = cli_app();
 
         ui.parse("nu")?;
-        assert_eq!(ui.version(), false);
-        assert_eq!(ui.help(), false);
-        assert_eq!(ui.takes_stdin(), false);
-        assert_eq!(ui.save_history(), true);
-        assert_eq!(ui.skip_plugins(), false);
+        assert!(!ui.version());
+        assert!(!ui.help());
+        assert!(!ui.takes_stdin());
+        assert!(ui.save_history());
+        assert!(!ui.skip_plugins());
         assert_eq!(ui.config(), None);
         assert_eq!(ui.loglevel(), None);
         assert_eq!(ui.debug(), None);
@@ -460,7 +460,7 @@ mod tests {
         let ui = cli_app();
 
         ui.parse("nu --version")?;
-        assert_eq!(ui.version(), true);
+        assert!(ui.version());
         Ok(())
     }
 
@@ -469,7 +469,7 @@ mod tests {
         let ui = cli_app();
 
         ui.parse("nu --help")?;
-        assert_eq!(ui.help(), true);
+        assert!(ui.help());
         Ok(())
     }
 
@@ -478,7 +478,7 @@ mod tests {
         let ui = cli_app();
 
         ui.parse("nu --stdin")?;
-        assert_eq!(ui.takes_stdin(), true);
+        assert!(ui.takes_stdin());
         Ok(())
     }
 
@@ -487,7 +487,7 @@ mod tests {
         let ui = cli_app();
 
         ui.parse("nu --no-history")?;
-        assert_eq!(ui.save_history(), false);
+        assert!(!ui.save_history());
         Ok(())
     }
 
@@ -496,7 +496,7 @@ mod tests {
         let ui = cli_app();
 
         ui.parse("nu --skip-plugins")?;
-        assert_eq!(ui.skip_plugins(), true);
+        assert!(ui.skip_plugins());
         Ok(())
     }
 

crates/nu-cli/src/keybinding.rs

@@ -155,14 +155,14 @@ fn convert_cmd(cmd: Cmd) -> rustyline::Cmd {
 fn convert_keybinding(keybinding: Keybinding) -> (rustyline::KeyEvent, rustyline::Cmd) {
     let rusty_modifiers = match keybinding.modifiers {
         Some(mods) => match mods {
-            NuModifiers::CTRL => Some(Modifiers::CTRL),
-            NuModifiers::ALT => Some(Modifiers::ALT),
-            NuModifiers::SHIFT => Some(Modifiers::SHIFT),
-            NuModifiers::NONE => Some(Modifiers::NONE),
-            NuModifiers::CTRL_SHIFT => Some(Modifiers::CTRL_SHIFT),
-            NuModifiers::ALT_SHIFT => Some(Modifiers::ALT_SHIFT),
-            NuModifiers::CTRL_ALT => Some(Modifiers::CTRL_ALT),
-            NuModifiers::CTRL_ALT_SHIFT => Some(Modifiers::CTRL_ALT_SHIFT),
+            NuModifiers::Ctrl => Some(Modifiers::CTRL),
+            NuModifiers::Alt => Some(Modifiers::ALT),
+            NuModifiers::Shift => Some(Modifiers::SHIFT),
+            NuModifiers::None => Some(Modifiers::NONE),
+            NuModifiers::CtrlShift => Some(Modifiers::CTRL_SHIFT),
+            NuModifiers::AltShift => Some(Modifiers::ALT_SHIFT),
+            NuModifiers::CtrlAlt => Some(Modifiers::CTRL_ALT),
+            NuModifiers::CtrlAltShift => Some(Modifiers::CTRL_ALT_SHIFT),
             // _ => None,
         },
         None => None,
@@ -412,24 +412,31 @@ pub enum CharSearch {
 /// The set of modifier keys that were triggered along with a key press.
 #[derive(Serialize, Deserialize)]
 #[allow(non_camel_case_types)]
-#[allow(clippy::clippy::upper_case_acronyms)]
 pub enum NuModifiers {
     /// Control modifier
-    CTRL = 8,
+    #[serde(alias = "CTRL")]
+    Ctrl = 8,
     /// Escape or Alt modifier
-    ALT = 4,
+    #[serde(alias = "ALT")]
+    Alt = 4,
     /// Shift modifier
-    SHIFT = 2,
+    #[serde(alias = "SHIFT")]
+    Shift = 2,
     /// No modifier
-    NONE = 0,
+    #[serde(alias = "NONE")]
+    None = 0,
     /// Ctrl + Shift
-    CTRL_SHIFT = 10,
+    #[serde(alias = "CTRL_SHIFT")]
+    CtrlShift = 10,
     /// Alt + Shift
-    ALT_SHIFT = 6,
+    #[serde(alias = "ALT_SHIFT")]
+    AltShift = 6,
     /// Ctrl + Alt
-    CTRL_ALT = 12,
+    #[serde(alias = "CTRL_ALT")]
+    CtrlAlt = 12,
     /// Ctrl + Alt + Shift
-    CTRL_ALT_SHIFT = 14,
+    #[serde(alias = "CTRL_ALT_SHIFT")]
+    CtrlAltShift = 14,
 }
 
 /// The number of times one command should be repeated.

crates/nu-cli/src/prelude.rs

@@ -36,24 +36,7 @@ pub(crate) use nu_engine::Host;
 pub(crate) use nu_errors::ShellError;
 #[allow(unused_imports)]
 pub(crate) use nu_protocol::outln;
-pub(crate) use nu_stream::ActionStream;
 #[allow(unused_imports)]
 pub(crate) use nu_value_ext::ValueExt;
 #[allow(unused_imports)]
 pub(crate) use std::sync::atomic::Ordering;
-
-#[allow(clippy::clippy::wrong_self_convention)]
-pub trait FromInputStream {
-    fn from_input_stream(self) -> ActionStream;
-}
-
-impl<T> FromInputStream for T
-where
-    T: Iterator<Item = nu_protocol::Value> + Send + Sync + 'static,
-{
-    fn from_input_stream(self) -> ActionStream {
-        ActionStream {
-            values: Box::new(self.map(nu_protocol::ReturnSuccess::value)),
-        }
-    }
-}