Finish removing profile command and related data (nushell#10807)

dmatos2012 · Oct 22, 2023 · a35ecb4 · a35ecb4
1 parent a01ef85
commit a35ecb4
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 150 deletions.
diff --git a/crates/nu-cmd-extra/src/extra/formats/to/html.rs b/crates/nu-cmd-extra/src/extra/formats/to/html.rs
@@ -289,11 +289,9 @@ fn to_html(
             })
             .collect();
         return Ok(
-            Value::list(result, head).into_pipeline_data_with_metadata(Box::new(
-                PipelineMetadata {
-                    data_source: DataSource::HtmlThemes,
-                },
-            )),
+            Value::list(result, head).into_pipeline_data_with_metadata(PipelineMetadata {
+                data_source: DataSource::HtmlThemes,
+            }),
         );
     } else {
         let theme_span = match &theme {

diff --git a/crates/nu-command/src/debug/metadata.rs b/crates/nu-command/src/debug/metadata.rs
@@ -55,46 +55,37 @@ impl Command for Metadata {
                             let origin = stack.get_var_with_origin(*var_id, *span)?;
 
                             Ok(
-                                build_metadata_record(&origin, input.metadata().as_deref(), head)
+                                build_metadata_record(&origin, input.metadata().as_ref(), head)
                                     .into_pipeline_data(),
                             )
                         }
                         _ => {
                             let val: Value = call.req(engine_state, stack, 0)?;
-                            Ok(
-                                build_metadata_record(&val, input.metadata().as_deref(), head)
-                                    .into_pipeline_data(),
-                            )
+                            Ok(build_metadata_record(&val, input.metadata().as_ref(), head)
+                                .into_pipeline_data())
                         }
                     }
                 } else {
                     let val: Value = call.req(engine_state, stack, 0)?;
-                    Ok(
-                        build_metadata_record(&val, input.metadata().as_deref(), head)
-                            .into_pipeline_data(),
-                    )
+                    Ok(build_metadata_record(&val, input.metadata().as_ref(), head)
+                        .into_pipeline_data())
                 }
             }
             Some(_) => {
                 let val: Value = call.req(engine_state, stack, 0)?;
-                Ok(
-                    build_metadata_record(&val, input.metadata().as_deref(), head)
-                        .into_pipeline_data(),
-                )
+                Ok(build_metadata_record(&val, input.metadata().as_ref(), head)
+                    .into_pipeline_data())
             }
             None => {
                 let mut record = Record::new();
-                if let Some(x) = input.metadata().as_deref() {
+                if let Some(x) = input.metadata().as_ref() {
                     match x {
                         PipelineMetadata {
                             data_source: DataSource::Ls,
                         } => record.push("source", Value::string("ls", head)),
                         PipelineMetadata {
                             data_source: DataSource::HtmlThemes,
                         } => record.push("source", Value::string("into html --list", head)),
-                        PipelineMetadata {
-                            data_source: DataSource::Profiling(values),
-                        } => record.push("profiling", Value::list(values.clone(), head)),
                     }
                 }
 
@@ -142,9 +133,6 @@ fn build_metadata_record(arg: &Value, metadata: Option<&PipelineMetadata>, head:
             PipelineMetadata {
                 data_source: DataSource::HtmlThemes,
             } => record.push("source", Value::string("into html --list", head)),
-            PipelineMetadata {
-                data_source: DataSource::Profiling(values),
-            } => record.push("profiling", Value::list(values.clone(), head)),
         }
     }
 

diff --git a/crates/nu-command/src/debug/mod.rs b/crates/nu-command/src/debug/mod.rs
@@ -5,7 +5,6 @@ mod info;
 mod inspect;
 mod inspect_table;
 mod metadata;
-mod profile;
 mod timeit;
 mod view;
 mod view_files;
@@ -19,7 +18,6 @@ pub use info::DebugInfo;
 pub use inspect::Inspect;
 pub use inspect_table::build_table;
 pub use metadata::Metadata;
-pub use profile::Profile;
 pub use timeit::TimeIt;
 pub use view::View;
 pub use view_files::ViewFiles;

diff --git a/crates/nu-command/src/debug/profile.rs b/crates/nu-command/src/debug/profile.rs
diff --git a/crates/nu-command/src/default_context.rs b/crates/nu-command/src/default_context.rs
@@ -138,7 +138,6 @@ pub fn add_shell_command_context(mut engine_state: EngineState) -> EngineState {
             Explain,
             Inspect,
             Metadata,
-            Profile,
             TimeIt,
             View,
             ViewFiles,

diff --git a/crates/nu-command/src/filesystem/ls.rs b/crates/nu-command/src/filesystem/ls.rs
@@ -266,9 +266,9 @@ impl Command for Ls {
                 _ => Some(Value::nothing(call_span)),
             })
             .into_pipeline_data_with_metadata(
-                Box::new(PipelineMetadata {
+                PipelineMetadata {
                     data_source: DataSource::Ls,
-                }),
+                },
                 engine_state.ctrlc.clone(),
             ))
     }

diff --git a/crates/nu-command/src/filters/uniq.rs b/crates/nu-command/src/filters/uniq.rs
@@ -258,7 +258,7 @@ pub fn uniq(
     call: &Call,
     input: Vec<Value>,
     item_mapper: Box<dyn Fn(ItemMapperState) -> ValueCounter>,
-    metadata: Option<Box<PipelineMetadata>>,
+    metadata: Option<PipelineMetadata>,
 ) -> Result<PipelineData, ShellError> {
     let ctrlc = engine_state.ctrlc.clone();
     let head = call.head;

diff --git a/crates/nu-command/src/viewers/table.rs b/crates/nu-command/src/viewers/table.rs
@@ -444,11 +444,11 @@ fn handle_row_stream(
     input: CmdInput<'_>,
     cfg: TableConfig,
     stream: ListStream,
-    metadata: Option<Box<PipelineMetadata>>,
+    metadata: Option<PipelineMetadata>,
 ) -> Result<PipelineData, ShellError> {
     let ctrlc = input.engine_state.ctrlc.clone();
 
-    let stream = match metadata.as_deref() {
+    let stream = match metadata.as_ref() {
         // First, `ls` sources:
         Some(PipelineMetadata {
             data_source: DataSource::Ls,

diff --git a/crates/nu-explore/src/nu_common/value.rs b/crates/nu-explore/src/nu_common/value.rs
@@ -19,7 +19,7 @@ pub fn collect_pipeline(input: PipelineData) -> (Vec<String>, Vec<Vec<Value>>) {
             metadata,
             span,
             ..
-        } => collect_external_stream(stdout, stderr, exit_code, metadata.map(|m| *m), span),
+        } => collect_external_stream(stdout, stderr, exit_code, metadata, span),
     }
 }
 

diff --git a/crates/nu-protocol/src/pipeline_data.rs b/crates/nu-protocol/src/pipeline_data.rs
@@ -40,16 +40,14 @@ const LINE_ENDING_PATTERN: &[char] = &['\r', '\n'];
 /// Nushell.
 #[derive(Debug)]
 pub enum PipelineData {
-    // Note: the PipelineMetadata is boxed everywhere because the DataSource::Profiling caused
-    // stack overflow on Windows CI when testing virtualenv
-    Value(Value, Option<Box<PipelineMetadata>>),
-    ListStream(ListStream, Option<Box<PipelineMetadata>>),
+    Value(Value, Option<PipelineMetadata>),
+    ListStream(ListStream, Option<PipelineMetadata>),
     ExternalStream {
         stdout: Option<RawStream>,
         stderr: Option<RawStream>,
         exit_code: Option<ListStream>,
         span: Span,
-        metadata: Option<Box<PipelineMetadata>>,
+        metadata: Option<PipelineMetadata>,
         trim_end_newline: bool,
     },
     Empty,
@@ -64,11 +62,10 @@ pub struct PipelineMetadata {
 pub enum DataSource {
     Ls,
     HtmlThemes,
-    Profiling(Vec<Value>),
 }
 
 impl PipelineData {
-    pub fn new_with_metadata(metadata: Option<Box<PipelineMetadata>>, span: Span) -> PipelineData {
+    pub fn new_with_metadata(metadata: Option<PipelineMetadata>, span: Span) -> PipelineData {
         PipelineData::Value(Value::nothing(span), metadata)
     }
 
@@ -93,7 +90,7 @@ impl PipelineData {
         PipelineData::Empty
     }
 
-    pub fn metadata(&self) -> Option<Box<PipelineMetadata>> {
+    pub fn metadata(&self) -> Option<PipelineMetadata> {
         match self {
             PipelineData::ListStream(_, x) => x.clone(),
             PipelineData::ExternalStream { metadata: x, .. } => x.clone(),
@@ -102,7 +99,7 @@ impl PipelineData {
         }
     }
 
-    pub fn set_metadata(mut self, metadata: Option<Box<PipelineMetadata>>) -> Self {
+    pub fn set_metadata(mut self, metadata: Option<PipelineMetadata>) -> Self {
         match &mut self {
             PipelineData::ListStream(_, x) => *x = metadata,
             PipelineData::ExternalStream { metadata: x, .. } => *x = metadata,
@@ -354,7 +351,7 @@ impl PipelineData {
     pub fn collect_string_strict(
         self,
         span: Span,
-    ) -> Result<(String, Span, Option<Box<PipelineMetadata>>), ShellError> {
+    ) -> Result<(String, Span, Option<PipelineMetadata>), ShellError> {
         match self {
             PipelineData::Empty => Ok((String::new(), span, None)),
             PipelineData::Value(Value::String { val, .. }, metadata) => Ok((val, span, metadata)),
@@ -926,7 +923,7 @@ pub trait IntoPipelineData {
 
     fn into_pipeline_data_with_metadata(
         self,
-        metadata: impl Into<Option<Box<PipelineMetadata>>>,
+        metadata: impl Into<Option<PipelineMetadata>>,
     ) -> PipelineData;
 }
 
@@ -940,7 +937,7 @@ where
 
     fn into_pipeline_data_with_metadata(
         self,
-        metadata: impl Into<Option<Box<PipelineMetadata>>>,
+        metadata: impl Into<Option<PipelineMetadata>>,
     ) -> PipelineData {
         PipelineData::Value(self.into(), metadata.into())
     }
@@ -950,7 +947,7 @@ pub trait IntoInterruptiblePipelineData {
     fn into_pipeline_data(self, ctrlc: Option<Arc<AtomicBool>>) -> PipelineData;
     fn into_pipeline_data_with_metadata(
         self,
-        metadata: impl Into<Option<Box<PipelineMetadata>>>,
+        metadata: impl Into<Option<PipelineMetadata>>,
         ctrlc: Option<Arc<AtomicBool>>,
     ) -> PipelineData;
 }
@@ -973,7 +970,7 @@ where
 
     fn into_pipeline_data_with_metadata(
         self,
-        metadata: impl Into<Option<Box<PipelineMetadata>>>,
+        metadata: impl Into<Option<PipelineMetadata>>,
         ctrlc: Option<Arc<AtomicBool>>,
     ) -> PipelineData {
         PipelineData::ListStream(
-Original file line number
+Diff line change
@@ Expand Up @@
                 metadata,
                 span,
                 ..
-            } => collect_external_stream(stdout, stderr, exit_code, metadata.map(|m| *m), span),
+            } => collect_external_stream(stdout, stderr, exit_code, metadata, span),
         }
     }
@@ Expand Down @@