From cad22bb833cc98373dbe0d88d2f14bde9c481af2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 10:35:08 +0800
Subject: [PATCH 01/42] Bump actions/checkout from 4.1.4 to 4.1.5 (#12804)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4
to 4.1.5.
Release notes
Sourced from actions/checkout's
releases.
v4.1.5
What's Changed
Full Changelog: https://github.com/actions/checkout/compare/v4.1.4...v4.1.5
Changelog
Sourced from actions/checkout's
changelog.
Changelog
Commits
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/audit.yml | 2 +-
.github/workflows/ci.yml | 8 ++++----
.github/workflows/nightly-build.yml | 8 ++++----
.github/workflows/release.yml | 4 ++--
.github/workflows/typos.yml | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
index 6d18269e89..e8a7f55817 100644
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@@ -19,7 +19,7 @@ jobs:
# Prevent sudden announcement of a new advisory from failing ci:
continue-on-error: true
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
- uses: rustsec/audit-check@v1.4.1
with:
token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5aec3f923a..4815491854 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
@@ -89,7 +89,7 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
@@ -121,7 +121,7 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
@@ -174,7 +174,7 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
- name: Setup Rust toolchain and cache
uses: actions-rust-lang/setup-rust-toolchain@v1.8.0
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index f86d7572a2..50235922e1 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -27,7 +27,7 @@ jobs:
# if: github.repository == 'nushell/nightly'
steps:
- name: Checkout
- uses: actions/checkout@v4.1.4
+ uses: actions/checkout@v4.1.5
if: github.repository == 'nushell/nightly'
with:
ref: main
@@ -123,7 +123,7 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
with:
ref: main
fetch-depth: 0
@@ -235,7 +235,7 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
with:
ref: main
fetch-depth: 0
@@ -310,7 +310,7 @@ jobs:
- name: Waiting for Release
run: sleep 1800
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
with:
ref: main
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fce38d9b4b..2cc7cbcd9b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -73,7 +73,7 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
- name: Update Rust Toolchain Target
run: |
@@ -163,7 +163,7 @@ jobs:
runs-on: ${{matrix.os}}
steps:
- - uses: actions/checkout@v4.1.4
+ - uses: actions/checkout@v4.1.5
- name: Update Rust Toolchain Target
run: |
diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
index a9354ade1d..dacfb83928 100644
--- a/.github/workflows/typos.yml
+++ b/.github/workflows/typos.yml
@@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Actions Repository
- uses: actions/checkout@v4.1.4
+ uses: actions/checkout@v4.1.5
- name: Check spelling
uses: crate-ci/typos@v1.21.0
From f851b61cb71dacffdf82d2d6ff7056d3e40f5377 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 10:35:18 +0800
Subject: [PATCH 02/42] Bump softprops/action-gh-release from 2.0.4 to 2.0.5
(#12803)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps
[softprops/action-gh-release](https://github.com/softprops/action-gh-release)
from 2.0.4 to 2.0.5.
Release notes
Sourced from softprops/action-gh-release's
releases.
v2.0.5
Changelog
Sourced from softprops/action-gh-release's
changelog.
2.0.5
Commits
Most Recent Ignore Conditions Applied to This Pull
Request
| Dependency Name | Ignore Conditions |
| --- | --- |
| softprops/action-gh-release | [< 0.2, > 0.1.13] |
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/nightly-build.yml | 4 ++--
.github/workflows/release.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 50235922e1..ab9f93d97d 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -174,7 +174,7 @@ jobs:
# REF: https://github.com/marketplace/actions/gh-release
# Create a release only in nushell/nightly repo
- name: Publish Archive
- uses: softprops/action-gh-release@v2.0.4
+ uses: softprops/action-gh-release@v2.0.5
if: ${{ startsWith(github.repository, 'nushell/nightly') }}
with:
prerelease: true
@@ -286,7 +286,7 @@ jobs:
# REF: https://github.com/marketplace/actions/gh-release
# Create a release only in nushell/nightly repo
- name: Publish Archive
- uses: softprops/action-gh-release@v2.0.4
+ uses: softprops/action-gh-release@v2.0.5
if: ${{ startsWith(github.repository, 'nushell/nightly') }}
with:
draft: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2cc7cbcd9b..ffe653bd22 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -104,7 +104,7 @@ jobs:
# REF: https://github.com/marketplace/actions/gh-release
- name: Publish Archive
- uses: softprops/action-gh-release@v2.0.4
+ uses: softprops/action-gh-release@v2.0.5
if: ${{ startsWith(github.ref, 'refs/tags/') }}
with:
draft: true
@@ -194,7 +194,7 @@ jobs:
# REF: https://github.com/marketplace/actions/gh-release
- name: Publish Archive
- uses: softprops/action-gh-release@v2.0.4
+ uses: softprops/action-gh-release@v2.0.5
if: ${{ startsWith(github.ref, 'refs/tags/') }}
with:
draft: true
From e462b6cd990904b770b8282c7c1eefdb3a5d94be Mon Sep 17 00:00:00 2001
From: Devyn Cairns
Date: Tue, 7 May 2024 20:12:32 -0700
Subject: [PATCH 03/42] Make the message when running a plugin exe directly
clearer (#12806)
# Description
This changes the message that shows up when running a plugin executable
directly rather than as a plugin to direct the user to run `plugin add
--help`, which should have enough information to figure out what's going
on. The message previously just vaguely suggested that the user needs to
run the plugin "from within Nushell", which is not really enough - it
has to be added with `plugin add` to be used as a plugin.
Also fix docs for `plugin add` to mention `plugin use` rather than
`register` (oops)
---
crates/nu-cmd-plugin/src/commands/plugin/add.rs | 3 ++-
crates/nu-plugin/src/plugin/mod.rs | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/crates/nu-cmd-plugin/src/commands/plugin/add.rs b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
index e2c1c31151..225941db01 100644
--- a/crates/nu-cmd-plugin/src/commands/plugin/add.rs
+++ b/crates/nu-cmd-plugin/src/commands/plugin/add.rs
@@ -43,7 +43,8 @@ impl Command for PluginAdd {
fn extra_usage(&self) -> &str {
r#"
-This does not load the plugin commands into the scope - see `register` for that.
+This does not load the plugin commands into the scope - see `plugin use` for
+that.
Instead, it runs the plugin to get its command signatures, and then edits the
plugin registry file (by default, `$nu.plugin-path`). The changes will be
diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs
index 0ec170f4cd..30ed196dc6 100644
--- a/crates/nu-plugin/src/plugin/mod.rs
+++ b/crates/nu-plugin/src/plugin/mod.rs
@@ -260,7 +260,8 @@ pub fn serve_plugin(plugin: &impl Plugin, encoder: impl PluginEncoder + 'static)
}
} else {
eprintln!(
- "{}: This plugin must be run from within Nushell.",
+ "{}: This plugin must be run from within Nushell. See `plugin add --help` for details \
+ on how to use plugins.",
env::current_exe()
.map(|path| path.display().to_string())
.unwrap_or_else(|_| "plugin".into())
From 3b26c08dab31b98658e0836dd113d1f7af6c8d29 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Wed, 8 May 2024 11:50:58 +0000
Subject: [PATCH 04/42] Refactor `parse` command (#12791)
# Description
- Switches the `excess` in the `ParserStream` and
`ParseStreamerExternal` types from a `Vec` to a `VecDeque`
- Removes unnecessary clones to `stream_helper`
- Other simplifications and loop restructuring
- Merges the `ParseStreamer` and `ParseStreamerExternal` types into a
common `ParseIter`
- `parse` now streams for list values
---
crates/nu-command/src/strings/parse.rs | 356 ++++++++++---------------
1 file changed, 136 insertions(+), 220 deletions(-)
diff --git a/crates/nu-command/src/strings/parse.rs b/crates/nu-command/src/strings/parse.rs
index 8f6d35b0b3..51067a16a2 100644
--- a/crates/nu-command/src/strings/parse.rs
+++ b/crates/nu-command/src/strings/parse.rs
@@ -1,9 +1,9 @@
-use fancy_regex::Regex;
+use fancy_regex::{Captures, Regex};
use nu_engine::command_prelude::*;
-use nu_protocol::{ListStream, ValueIterator};
-use std::sync::{
- atomic::{AtomicBool, Ordering},
- Arc,
+use nu_protocol::ListStream;
+use std::{
+ collections::VecDeque,
+ sync::{atomic::AtomicBool, Arc},
};
#[derive(Clone)]
@@ -119,7 +119,6 @@ fn operate(
let head = call.head;
let pattern: Spanned = call.req(engine_state, stack, 0)?;
let regex: bool = call.has_flag(engine_state, stack, "regex")?;
- let ctrlc = engine_state.ctrlc.clone();
let pattern_item = pattern.item;
let pattern_span = pattern.span;
@@ -130,7 +129,7 @@ fn operate(
build_regex(&pattern_item, pattern_span)?
};
- let regex_pattern = Regex::new(&item_to_parse).map_err(|e| ShellError::GenericError {
+ let regex = Regex::new(&item_to_parse).map_err(|e| ShellError::GenericError {
error: "Error with regular expression".into(),
msg: e.to_string(),
span: Some(pattern_span),
@@ -138,92 +137,108 @@ fn operate(
inner: vec![],
})?;
- let columns = column_names(®ex_pattern);
+ let columns = regex
+ .capture_names()
+ .skip(1)
+ .enumerate()
+ .map(|(i, name)| {
+ name.map(String::from)
+ .unwrap_or_else(|| format!("capture{i}"))
+ })
+ .collect::>();
+
+ let ctrlc = engine_state.ctrlc.clone();
match input {
PipelineData::Empty => Ok(PipelineData::Empty),
- PipelineData::Value(..) => {
- let mut parsed: Vec = Vec::new();
+ PipelineData::Value(value, ..) => match value {
+ Value::String { val, .. } => {
+ let captures = regex
+ .captures_iter(&val)
+ .map(|captures| captures_to_value(captures, &columns, head))
+ .collect::>()?;
- for v in input {
- let v_span = v.span();
- match v.coerce_into_string() {
- Ok(s) => {
- let results = regex_pattern.captures_iter(&s);
-
- for c in results {
- let captures = match c {
- Ok(c) => c,
- Err(e) => {
- return Err(ShellError::GenericError {
- error: "Error with regular expression captures".into(),
- msg: e.to_string(),
- span: None,
- help: None,
- inner: vec![],
- })
- }
- };
-
- let record = columns
- .iter()
- .zip(captures.iter().skip(1))
- .map(|(column_name, cap)| {
- let cap_string = cap.map(|v| v.as_str()).unwrap_or("");
- (column_name.clone(), Value::string(cap_string, v_span))
- })
- .collect();
-
- parsed.push(Value::record(record, head));
- }
- }
- Err(_) => {
- return Err(ShellError::PipelineMismatch {
- exp_input_type: "string".into(),
- dst_span: head,
- src_span: v_span,
- })
- }
- }
+ Ok(Value::list(captures, head).into_pipeline_data())
}
+ Value::List { vals, .. } => {
+ let iter = vals.into_iter().map(move |val| {
+ let span = val.span();
+ val.into_string().map_err(|_| ShellError::PipelineMismatch {
+ exp_input_type: "string".into(),
+ dst_span: head,
+ src_span: span,
+ })
+ });
- Ok(ListStream::new(parsed.into_iter(), head, ctrlc).into())
- }
+ let iter = ParseIter {
+ captures: VecDeque::new(),
+ regex,
+ columns,
+ iter,
+ span: head,
+ ctrlc,
+ };
+
+ Ok(ListStream::new(iter, head, None).into())
+ }
+ value => Err(ShellError::PipelineMismatch {
+ exp_input_type: "string".into(),
+ dst_span: head,
+ src_span: value.span(),
+ }),
+ },
PipelineData::ListStream(stream, ..) => Ok(stream
- .modify(|stream| ParseStreamer {
- span: head,
- excess: Vec::new(),
- regex: regex_pattern,
- columns,
- stream,
- ctrlc,
+ .modify(|stream| {
+ let iter = stream.map(move |val| {
+ let span = val.span();
+ val.into_string().map_err(|_| ShellError::PipelineMismatch {
+ exp_input_type: "string".into(),
+ dst_span: head,
+ src_span: span,
+ })
+ });
+
+ ParseIter {
+ captures: VecDeque::new(),
+ regex,
+ columns,
+ iter,
+ span: head,
+ ctrlc,
+ }
})
.into()),
-
PipelineData::ExternalStream { stdout: None, .. } => Ok(PipelineData::Empty),
-
PipelineData::ExternalStream {
stdout: Some(stream),
..
- } => Ok(ListStream::new(
- ParseStreamerExternal {
- span: head,
- excess: Vec::new(),
- regex: regex_pattern,
+ } => {
+ // Collect all `stream` chunks into a single `chunk` to be able to deal with matches that
+ // extend across chunk boundaries.
+ // This is a stop-gap solution until the `regex` crate supports streaming or an alternative
+ // solution is found.
+ // See https://github.com/nushell/nushell/issues/9795
+ let str = stream.into_string()?.item;
+
+ // let iter = stream.lines();
+
+ let iter = ParseIter {
+ captures: VecDeque::new(),
+ regex,
columns,
- stream: stream.stream,
- },
- head,
- ctrlc,
- )
- .into()),
+ iter: std::iter::once(Ok(str)),
+ span: head,
+ ctrlc,
+ };
+
+ Ok(ListStream::new(iter, head, None).into())
+ }
}
}
fn build_regex(input: &str, span: Span) -> Result {
let mut output = "(?s)\\A".to_string();
- //let mut loop_input = input;
let mut loop_input = input.chars().peekable();
loop {
let mut before = String::new();
@@ -274,172 +289,73 @@ fn build_regex(input: &str, span: Span) -> Result {
Ok(output)
}
-fn column_names(regex: &Regex) -> Vec {
- regex
- .capture_names()
- .enumerate()
- .skip(1)
- .map(|(i, name)| {
- name.map(String::from)
- .unwrap_or_else(|| format!("capture{}", i - 1))
- })
- .collect()
-}
-
-pub struct ParseStreamer {
- span: Span,
- excess: Vec,
+struct ParseIter>> {
+ captures: VecDeque,
regex: Regex,
columns: Vec,
- stream: ValueIterator,
+ iter: I,
+ span: Span,
ctrlc: Option>,
}
-impl Iterator for ParseStreamer {
- type Item = Value;
- fn next(&mut self) -> Option {
- if !self.excess.is_empty() {
- return Some(self.excess.remove(0));
+impl>> ParseIter {
+ fn populate_captures(&mut self, str: &str) -> Result<(), ShellError> {
+ for captures in self.regex.captures_iter(str) {
+ self.captures
+ .push_back(captures_to_value(captures, &self.columns, self.span)?);
}
+ Ok(())
+ }
+}
+impl>> Iterator for ParseIter {
+ type Item = Value;
+
+ fn next(&mut self) -> Option {
loop {
- if let Some(ctrlc) = &self.ctrlc {
- if ctrlc.load(Ordering::SeqCst) {
- break None;
- }
+ if nu_utils::ctrl_c::was_pressed(&self.ctrlc) {
+ return None;
}
- let v = self.stream.next()?;
- let span = v.span();
+ if let Some(val) = self.captures.pop_front() {
+ return Some(val);
+ }
- let Ok(s) = v.coerce_into_string() else {
- return Some(Value::error(
- ShellError::PipelineMismatch {
- exp_input_type: "string".into(),
- dst_span: self.span,
- src_span: span,
- },
- span,
- ));
- };
+ let result = self
+ .iter
+ .next()?
+ .and_then(|str| self.populate_captures(&str));
- let parsed = stream_helper(
- self.regex.clone(),
- span,
- s,
- self.columns.clone(),
- &mut self.excess,
- );
-
- if parsed.is_none() {
- continue;
- };
-
- return parsed;
+ if let Err(err) = result {
+ return Some(Value::error(err, self.span));
+ }
}
}
}
-pub struct ParseStreamerExternal {
+fn captures_to_value(
+ captures: Result,
+ columns: &[String],
span: Span,
- excess: Vec,
- regex: Regex,
- columns: Vec,
- stream: Box, ShellError>> + Send + 'static>,
-}
+) -> Result {
+ let captures = captures.map_err(|err| ShellError::GenericError {
+ error: "Error with regular expression captures".into(),
+ msg: err.to_string(),
+ span: Some(span),
+ help: None,
+ inner: vec![],
+ })?;
-impl Iterator for ParseStreamerExternal {
- type Item = Value;
- fn next(&mut self) -> Option {
- if !self.excess.is_empty() {
- return Some(self.excess.remove(0));
- }
+ let record = columns
+ .iter()
+ .zip(captures.iter().skip(1))
+ .map(|(column, match_)| {
+ let match_str = match_.map(|m| m.as_str()).unwrap_or("");
+ (column.clone(), Value::string(match_str, span))
+ })
+ .collect();
- let mut chunk = self.stream.next();
-
- // Collect all `stream` chunks into a single `chunk` to be able to deal with matches that
- // extend across chunk boundaries.
- // This is a stop-gap solution until the `regex` crate supports streaming or an alternative
- // solution is found.
- // See https://github.com/nushell/nushell/issues/9795
- while let Some(Ok(chunks)) = &mut chunk {
- match self.stream.next() {
- Some(Ok(mut next_chunk)) => chunks.append(&mut next_chunk),
- error @ Some(Err(_)) => chunk = error,
- None => break,
- }
- }
-
- let chunk = match chunk {
- Some(Ok(chunk)) => chunk,
- Some(Err(err)) => return Some(Value::error(err, self.span)),
- _ => return None,
- };
-
- let Ok(chunk) = String::from_utf8(chunk) else {
- return Some(Value::error(
- ShellError::PipelineMismatch {
- exp_input_type: "string".into(),
- dst_span: self.span,
- src_span: self.span,
- },
- self.span,
- ));
- };
-
- stream_helper(
- self.regex.clone(),
- self.span,
- chunk,
- self.columns.clone(),
- &mut self.excess,
- )
- }
-}
-
-fn stream_helper(
- regex: Regex,
- span: Span,
- s: String,
- columns: Vec,
- excess: &mut Vec,
-) -> Option {
- let results = regex.captures_iter(&s);
-
- for c in results {
- let captures = match c {
- Ok(c) => c,
- Err(e) => {
- return Some(Value::error(
- ShellError::GenericError {
- error: "Error with regular expression captures".into(),
- msg: e.to_string(),
- span: Some(span),
- help: Some(e.to_string()),
- inner: vec![],
- },
- span,
- ))
- }
- };
-
- let record = columns
- .iter()
- .zip(captures.iter().skip(1))
- .map(|(column_name, cap)| {
- let cap_string = cap.map(|v| v.as_str()).unwrap_or("");
- (column_name.clone(), Value::string(cap_string, span))
- })
- .collect();
-
- excess.push(Value::record(record, span));
- }
-
- if !excess.is_empty() {
- Some(excess.remove(0))
- } else {
- None
- }
+ Ok(Value::record(record, span))
}
#[cfg(test)]
From 5466da3b52352ba67d98504cfc186db42eea4543 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 8 May 2024 14:34:04 -0400
Subject: [PATCH 05/42] cleanup osc calls for shell_integration (#12810)
# Description
This PR is a continuation of #12629 and meant to address [Reilly's
stated
issue](https://github.com/nushell/nushell/pull/12629#issuecomment-2099660609).
With this PR, nushell should work more consistently with WezTerm on
Windows. However, that means continued scrolling with typing if osc133
is enabled. If it's possible to run WezTerm inside of vscode, then
having osc633 enabled will also cause the display to scroll with every
character typed. I think the cause of this is that reedline paints the
entire prompt on each character typed. We need to figure out how to fix
that, but that's in reedline.
For my purposes, I keep osc133 and osc633 set to true and don't use
WezTerm on Windows.
Thanks @rgwood for reporting the issue. I found several logic errors.
It's often good to come back to PRs and look at them with fresh eyes. I
think this is pretty close to logically correct now. However, I'm
approaching burn out on ansi escape codes so i could've missed
something.
Kudos to [escape-artist](https://github.com/rgwood/escape-artist) for
helping me debug an ansi escape codes that are actually being sent to
the terminal. It was an invaluable tool.
# User-Facing Changes
# Tests + Formatting
# After Submitting
---
crates/nu-cli/src/prompt.rs | 6 ++-
crates/nu-cli/src/prompt_update.rs | 56 ++++++++--------------
crates/nu-cli/src/repl.rs | 76 +++++++++++++++++++++---------
3 files changed, 79 insertions(+), 59 deletions(-)
diff --git a/crates/nu-cli/src/prompt.rs b/crates/nu-cli/src/prompt.rs
index a2045a201c..744640b76f 100644
--- a/crates/nu-cli/src/prompt.rs
+++ b/crates/nu-cli/src/prompt.rs
@@ -129,9 +129,11 @@ impl Prompt for NushellPrompt {
{
// We're in vscode and we have osc633 enabled
format!("{VSCODE_PRE_PROMPT_MARKER}{prompt}{VSCODE_POST_PROMPT_MARKER}").into()
- } else {
- // If we're in VSCode but we don't find the env var, just return the regular markers
+ } else if self.shell_integration_osc133 {
+ // If we're in VSCode but we don't find the env var, but we have osc133 set, then use it
format!("{PRE_PROMPT_MARKER}{prompt}{POST_PROMPT_MARKER}").into()
+ } else {
+ prompt.into()
}
} else if self.shell_integration_osc133 {
format!("{PRE_PROMPT_MARKER}{prompt}{POST_PROMPT_MARKER}").into()
diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index 0c5641378b..5fe2485ca8 100644
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -108,50 +108,34 @@ pub(crate) fn update_prompt(
stack: &mut Stack,
nu_prompt: &mut NushellPrompt,
) {
- let left_prompt_string = get_prompt_string(PROMPT_COMMAND, config, engine_state, stack);
+ let configured_left_prompt_string =
+ match get_prompt_string(PROMPT_COMMAND, config, engine_state, stack) {
+ Some(s) => s,
+ None => "".to_string(),
+ };
// Now that we have the prompt string lets ansify it.
// <133 A><133 B><133 C>
- let left_prompt_string_133 = if config.shell_integration_osc133 {
- if let Some(prompt_string) = left_prompt_string.clone() {
+ let left_prompt_string = if config.shell_integration_osc633 {
+ if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+ // We're in vscode and we have osc633 enabled
Some(format!(
- "{PRE_PROMPT_MARKER}{prompt_string}{POST_PROMPT_MARKER}"
+ "{VSCODE_PRE_PROMPT_MARKER}{configured_left_prompt_string}{VSCODE_POST_PROMPT_MARKER}"
+ ))
+ } else if config.shell_integration_osc133 {
+ // If we're in VSCode but we don't find the env var, but we have osc133 set, then use it
+ Some(format!(
+ "{PRE_PROMPT_MARKER}{configured_left_prompt_string}{POST_PROMPT_MARKER}"
))
} else {
- left_prompt_string.clone()
+ configured_left_prompt_string.into()
}
+ } else if config.shell_integration_osc133 {
+ Some(format!(
+ "{PRE_PROMPT_MARKER}{configured_left_prompt_string}{POST_PROMPT_MARKER}"
+ ))
} else {
- left_prompt_string.clone()
- };
-
- let left_prompt_string_633 = if config.shell_integration_osc633 {
- if let Some(prompt_string) = left_prompt_string.clone() {
- if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode"))
- {
- // If the user enabled osc633 and we're in vscode, use the vscode markers
- Some(format!(
- "{VSCODE_PRE_PROMPT_MARKER}{prompt_string}{VSCODE_POST_PROMPT_MARKER}"
- ))
- } else {
- // otherwise, use the regular osc133 markers
- Some(format!(
- "{PRE_PROMPT_MARKER}{prompt_string}{POST_PROMPT_MARKER}"
- ))
- }
- } else {
- left_prompt_string.clone()
- }
- } else {
- left_prompt_string.clone()
- };
-
- let left_prompt_string = match (left_prompt_string_133, left_prompt_string_633) {
- (None, None) => left_prompt_string,
- (None, Some(l633)) => Some(l633),
- (Some(l133), None) => Some(l133),
- // If both are set, it means we're in vscode, so use the vscode markers
- // and even if we're not actually in vscode atm, the regular 133 markers are used
- (Some(_l133), Some(l633)) => Some(l633),
+ configured_left_prompt_string.into()
};
let right_prompt_string = get_prompt_string(PROMPT_COMMAND_RIGHT, config, engine_state, stack);
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 30cccebbde..338d924a69 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -620,7 +620,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
column!(),
use_color,
);
- } else {
+ } else if shell_integration_osc133 {
start_time = Instant::now();
run_ansi_sequence(PRE_EXECUTION_MARKER);
@@ -660,9 +660,9 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
run_finaliziation_ansi_sequence(
&stack,
engine_state,
+ use_color,
shell_integration_osc633,
shell_integration_osc133,
- use_color,
);
}
ReplOperation::RunCommand(cmd) => {
@@ -679,9 +679,9 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
run_finaliziation_ansi_sequence(
&stack,
engine_state,
+ use_color,
shell_integration_osc633,
shell_integration_osc133,
- use_color,
);
}
// as the name implies, we do nothing in this case
@@ -731,9 +731,9 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
run_finaliziation_ansi_sequence(
&stack,
engine_state,
+ use_color,
shell_integration_osc633,
shell_integration_osc133,
- use_color,
);
}
Ok(Signal::CtrlD) => {
@@ -742,9 +742,9 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
run_finaliziation_ansi_sequence(
&stack,
engine_state,
+ use_color,
shell_integration_osc633,
shell_integration_osc133,
- use_color,
);
println!();
@@ -763,9 +763,9 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
run_finaliziation_ansi_sequence(
&stack,
engine_state,
+ use_color,
shell_integration_osc633,
shell_integration_osc133,
- use_color,
);
}
}
@@ -1298,27 +1298,46 @@ fn map_nucursorshape_to_cursorshape(shape: NuCursorShape) -> Option String {
+fn get_command_finished_marker(
+ stack: &Stack,
+ engine_state: &EngineState,
+ shell_integration_osc633: bool,
+ shell_integration_osc133: bool,
+) -> String {
let exit_code = stack
.get_env_var(engine_state, "LAST_EXIT_CODE")
.and_then(|e| e.as_i64().ok());
- if vscode {
- // format!("\x1b]633;D;{}\x1b\\", exit_code.unwrap_or(0))
- format!(
- "{}{}{}",
- VSCODE_POST_EXECUTION_MARKER_PREFIX,
- exit_code.unwrap_or(0),
- VSCODE_POST_EXECUTION_MARKER_SUFFIX
- )
- } else {
- // format!("\x1b]133;D;{}\x1b\\", exit_code.unwrap_or(0))
+ if shell_integration_osc633 {
+ if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
+ // We're in vscode and we have osc633 enabled
+ format!(
+ "{}{}{}",
+ VSCODE_POST_EXECUTION_MARKER_PREFIX,
+ exit_code.unwrap_or(0),
+ VSCODE_POST_EXECUTION_MARKER_SUFFIX
+ )
+ } else if shell_integration_osc133 {
+ // If we're in VSCode but we don't find the env var, just return the regular markers
+ format!(
+ "{}{}{}",
+ POST_EXECUTION_MARKER_PREFIX,
+ exit_code.unwrap_or(0),
+ POST_EXECUTION_MARKER_SUFFIX
+ )
+ } else {
+ // We're not in vscode, so we don't need to do anything special
+ "\x1b[0m".to_string()
+ }
+ } else if shell_integration_osc133 {
format!(
"{}{}{}",
POST_EXECUTION_MARKER_PREFIX,
exit_code.unwrap_or(0),
POST_EXECUTION_MARKER_SUFFIX
)
+ } else {
+ "\x1b[0m".to_string()
}
}
@@ -1342,7 +1361,12 @@ fn run_finaliziation_ansi_sequence(
if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
let start_time = Instant::now();
- run_ansi_sequence(&get_command_finished_marker(stack, engine_state, true));
+ run_ansi_sequence(&get_command_finished_marker(
+ stack,
+ engine_state,
+ shell_integration_osc633,
+ shell_integration_osc133,
+ ));
perf(
"post_execute_marker (633;D) ansi escape sequences",
@@ -1352,10 +1376,15 @@ fn run_finaliziation_ansi_sequence(
column!(),
use_color,
);
- } else {
+ } else if shell_integration_osc133 {
let start_time = Instant::now();
- run_ansi_sequence(&get_command_finished_marker(stack, engine_state, false));
+ run_ansi_sequence(&get_command_finished_marker(
+ stack,
+ engine_state,
+ shell_integration_osc633,
+ shell_integration_osc133,
+ ));
perf(
"post_execute_marker (133;D) ansi escape sequences",
@@ -1369,7 +1398,12 @@ fn run_finaliziation_ansi_sequence(
} else if shell_integration_osc133 {
let start_time = Instant::now();
- run_ansi_sequence(&get_command_finished_marker(stack, engine_state, false));
+ run_ansi_sequence(&get_command_finished_marker(
+ stack,
+ engine_state,
+ shell_integration_osc633,
+ shell_integration_osc133,
+ ));
perf(
"post_execute_marker (133;D) ansi escape sequences",
From 92831d7efcd0586a85966560beb0c538f4a0fc36 Mon Sep 17 00:00:00 2001
From: Andy Gayton
Date: Wed, 8 May 2024 15:45:44 -0400
Subject: [PATCH 06/42] feat: add an echo command to nu_plugin_example (#12754)
# Description
This PR adds a new `echo` command to the `nu_plugin_example` plugin that
simply [streams all of its input to its
output](https://github.com/nushell/nushell/pull/12754/files#diff-de9fcf086b8c373039dadcc2bcb664c6014c0b2af8568eab68c0b6666ac5ccceR47).
```
: "hi" | example echo
hi
```
The motivation for adding it is to have a convenient command to exercise
interactivity on slow pipelines.
I'll follow up on that front with [another
PR](https://github.com/cablehead/nushell/pull/1/files)
# Tests + Formatting
https://github.com/nushell/nushell/pull/12754/files#diff-de9fcf086b8c373039dadcc2bcb664c6014c0b2af8568eab68c0b6666ac5ccceR51-R55
---
crates/nu_plugin_example/src/commands/echo.rs | 55 +++++++++++++++++++
crates/nu_plugin_example/src/commands/mod.rs | 2 +
crates/nu_plugin_example/src/lib.rs | 1 +
3 files changed, 58 insertions(+)
create mode 100644 crates/nu_plugin_example/src/commands/echo.rs
diff --git a/crates/nu_plugin_example/src/commands/echo.rs b/crates/nu_plugin_example/src/commands/echo.rs
new file mode 100644
index 0000000000..e60ccf8107
--- /dev/null
+++ b/crates/nu_plugin_example/src/commands/echo.rs
@@ -0,0 +1,55 @@
+use nu_plugin::{EngineInterface, EvaluatedCall, PluginCommand};
+use nu_protocol::{Category, Example, LabeledError, PipelineData, Signature, Type, Value};
+
+use crate::ExamplePlugin;
+
+/// ` | example echo`
+pub struct Echo;
+
+impl PluginCommand for Echo {
+ type Plugin = ExamplePlugin;
+
+ fn name(&self) -> &str {
+ "example echo"
+ }
+
+ fn usage(&self) -> &str {
+ "Example stream consumer that outputs the received input"
+ }
+
+ fn signature(&self) -> Signature {
+ Signature::build(self.name())
+ .input_output_types(vec![(Type::Any, Type::Any)])
+ .category(Category::Experimental)
+ }
+
+ fn search_terms(&self) -> Vec<&str> {
+ vec!["example"]
+ }
+
+ fn examples(&self) -> Vec {
+ vec![Example {
+ example: "example seq 1 5 | example echo",
+ description: "echos the values from 1 to 5",
+ result: Some(Value::test_list(
+ (1..=5).map(Value::test_int).collect::>(),
+ )),
+ }]
+ }
+
+ fn run(
+ &self,
+ _plugin: &ExamplePlugin,
+ _engine: &EngineInterface,
+ _call: &EvaluatedCall,
+ input: PipelineData,
+ ) -> Result {
+ Ok(input)
+ }
+}
+
+#[test]
+fn test_examples() -> Result<(), nu_protocol::ShellError> {
+ use nu_plugin_test_support::PluginTest;
+ PluginTest::new("example", ExamplePlugin.into())?.test_command_examples(&Echo)
+}
diff --git a/crates/nu_plugin_example/src/commands/mod.rs b/crates/nu_plugin_example/src/commands/mod.rs
index 2d7ef4274a..9425dad4ca 100644
--- a/crates/nu_plugin_example/src/commands/mod.rs
+++ b/crates/nu_plugin_example/src/commands/mod.rs
@@ -25,12 +25,14 @@ pub use view_span::ViewSpan;
// Stream demos
mod collect_external;
+mod echo;
mod for_each;
mod generate;
mod seq;
mod sum;
pub use collect_external::CollectExternal;
+pub use echo::Echo;
pub use for_each::ForEach;
pub use generate::Generate;
pub use seq::Seq;
diff --git a/crates/nu_plugin_example/src/lib.rs b/crates/nu_plugin_example/src/lib.rs
index 0c394c78aa..e87c31229d 100644
--- a/crates/nu_plugin_example/src/lib.rs
+++ b/crates/nu_plugin_example/src/lib.rs
@@ -25,6 +25,7 @@ impl Plugin for ExamplePlugin {
Box::new(DisableGc),
// Stream demos
Box::new(CollectExternal),
+ Box::new(Echo),
Box::new(ForEach),
Box::new(Generate),
Box::new(Seq),
From ba6f38510cd231e5ae4808b1a56cea6770f1e41b Mon Sep 17 00:00:00 2001
From: Stefan Holderbach
Date: Thu, 9 May 2024 02:10:58 +0200
Subject: [PATCH 07/42] Shrink `Value` by boxing `Range`/`Closure` (#12784)
# Description
On 64-bit platforms the current size of `Value` is 56 bytes. The
limiting variants were `Closure` and `Range`. Boxing the two reduces the
size of Value to 48 bytes. This is the minimal size possible with our
current 16-byte `Span` and any 24-byte `Vec` container which we use in
several variants. (Note the extra full 8-bytes necessary for the
discriminant or other smaller values due to the 8-byte alignment of
`usize`)
This is leads to a size reduction of ~15% for `Value` and should overall
be beneficial as both `Range` and `Closure` are rarely used compared to
the primitive types or even our general container types.
# User-Facing Changes
Less memory used, potential runtime benefits.
(Too late in the evening to run the benchmarks myself right now)
---
crates/nu-cli/src/prompt_update.rs | 2 +-
crates/nu-cmd-lang/src/example_support.rs | 2 +-
crates/nu-color-config/src/style_computer.rs | 5 ++++-
crates/nu-command/src/filters/group_by.rs | 2 +-
crates/nu-command/src/filters/insert.rs | 10 +++++-----
crates/nu-command/src/filters/update.rs | 8 ++++----
crates/nu-command/src/filters/upsert.rs | 10 +++++-----
crates/nu-command/src/filters/zip.rs | 2 +-
crates/nu-plugin-engine/src/context.rs | 2 +-
crates/nu-protocol/src/pipeline_data/mod.rs | 4 ++--
crates/nu-protocol/src/value/from_value.rs | 8 ++++----
crates/nu-protocol/src/value/mod.rs | 18 +++++++++---------
crates/nuon/src/to.rs | 2 +-
13 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index 5fe2485ca8..827bff0e5a 100644
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -65,7 +65,7 @@ fn get_prompt_string(
.get_env_var(engine_state, prompt)
.and_then(|v| match v {
Value::Closure { val, .. } => {
- let result = ClosureEvalOnce::new(engine_state, stack, val)
+ let result = ClosureEvalOnce::new(engine_state, stack, *val)
.run_with_input(PipelineData::Empty);
trace!(
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index 42dcd447b7..860572f349 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -223,7 +223,7 @@ impl<'a> std::fmt::Debug for DebuggableValue<'a> {
Value::Date { val, .. } => {
write!(f, "Date({:?})", val)
}
- Value::Range { val, .. } => match val {
+ Value::Range { val, .. } => match **val {
Range::IntRange(range) => match range.end() {
Bound::Included(end) => write!(
f,
diff --git a/crates/nu-color-config/src/style_computer.rs b/crates/nu-color-config/src/style_computer.rs
index cd2454f011..2293439183 100644
--- a/crates/nu-color-config/src/style_computer.rs
+++ b/crates/nu-color-config/src/style_computer.rs
@@ -146,7 +146,10 @@ impl<'a> StyleComputer<'a> {
let span = value.span();
match value {
Value::Closure { val, .. } => {
- map.insert(key.to_string(), ComputableStyle::Closure(val.clone(), span));
+ map.insert(
+ key.to_string(),
+ ComputableStyle::Closure(*val.clone(), span),
+ );
}
Value::Record { .. } => {
map.insert(
diff --git a/crates/nu-command/src/filters/group_by.rs b/crates/nu-command/src/filters/group_by.rs
index acd5ae5b1a..24559c1eca 100644
--- a/crates/nu-command/src/filters/group_by.rs
+++ b/crates/nu-command/src/filters/group_by.rs
@@ -139,7 +139,7 @@ pub fn group_by(
match grouper {
Value::CellPath { val, .. } => group_cell_path(val, values)?,
Value::Closure { val, .. } => {
- group_closure(values, span, val, engine_state, stack)?
+ group_closure(values, span, *val, engine_state, stack)?
}
_ => {
return Err(ShellError::TypeMismatch {
diff --git a/crates/nu-command/src/filters/insert.rs b/crates/nu-command/src/filters/insert.rs
index c87a2a78b9..d9fb165a16 100644
--- a/crates/nu-command/src/filters/insert.rs
+++ b/crates/nu-command/src/filters/insert.rs
@@ -133,7 +133,7 @@ fn insert(
if let Value::Closure { val, .. } = replacement {
match (cell_path.members.first(), &mut value) {
(Some(PathMember::String { .. }), Value::List { vals, .. }) => {
- let mut closure = ClosureEval::new(engine_state, stack, val);
+ let mut closure = ClosureEval::new(engine_state, stack, *val);
for val in vals {
insert_value_by_closure(
val,
@@ -147,7 +147,7 @@ fn insert(
(first, _) => {
insert_single_value_by_closure(
&mut value,
- ClosureEvalOnce::new(engine_state, stack, val),
+ ClosureEvalOnce::new(engine_state, stack, *val),
head,
&cell_path.members,
matches!(first, Some(PathMember::Int { .. })),
@@ -188,7 +188,7 @@ fn insert(
let value = stream.next();
let end_of_stream = value.is_none();
let value = value.unwrap_or(Value::nothing(head));
- let new_value = ClosureEvalOnce::new(engine_state, stack, val)
+ let new_value = ClosureEvalOnce::new(engine_state, stack, *val)
.run_with_value(value.clone())?
.into_value(head);
@@ -203,7 +203,7 @@ fn insert(
if let Value::Closure { val, .. } = replacement {
insert_single_value_by_closure(
&mut value,
- ClosureEvalOnce::new(engine_state, stack, val),
+ ClosureEvalOnce::new(engine_state, stack, *val),
head,
path,
true,
@@ -224,7 +224,7 @@ fn insert(
.chain(stream)
.into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
} else if let Value::Closure { val, .. } = replacement {
- let mut closure = ClosureEval::new(engine_state, stack, val);
+ let mut closure = ClosureEval::new(engine_state, stack, *val);
let stream = stream.map(move |mut value| {
let err = insert_value_by_closure(
&mut value,
diff --git a/crates/nu-command/src/filters/update.rs b/crates/nu-command/src/filters/update.rs
index 2cea7deead..d963e39995 100644
--- a/crates/nu-command/src/filters/update.rs
+++ b/crates/nu-command/src/filters/update.rs
@@ -117,7 +117,7 @@ fn update(
if let Value::Closure { val, .. } = replacement {
match (cell_path.members.first(), &mut value) {
(Some(PathMember::String { .. }), Value::List { vals, .. }) => {
- let mut closure = ClosureEval::new(engine_state, stack, val);
+ let mut closure = ClosureEval::new(engine_state, stack, *val);
for val in vals {
update_value_by_closure(
val,
@@ -131,7 +131,7 @@ fn update(
(first, _) => {
update_single_value_by_closure(
&mut value,
- ClosureEvalOnce::new(engine_state, stack, val),
+ ClosureEvalOnce::new(engine_state, stack, *val),
head,
&cell_path.members,
matches!(first, Some(PathMember::Int { .. })),
@@ -175,7 +175,7 @@ fn update(
if let Value::Closure { val, .. } = replacement {
update_single_value_by_closure(
value,
- ClosureEvalOnce::new(engine_state, stack, val),
+ ClosureEvalOnce::new(engine_state, stack, *val),
head,
path,
true,
@@ -189,7 +189,7 @@ fn update(
.chain(stream)
.into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
} else if let Value::Closure { val, .. } = replacement {
- let mut closure = ClosureEval::new(engine_state, stack, val);
+ let mut closure = ClosureEval::new(engine_state, stack, *val);
let stream = stream.map(move |mut value| {
let err = update_value_by_closure(
&mut value,
diff --git a/crates/nu-command/src/filters/upsert.rs b/crates/nu-command/src/filters/upsert.rs
index b7b4a782f2..6b62b1d7bc 100644
--- a/crates/nu-command/src/filters/upsert.rs
+++ b/crates/nu-command/src/filters/upsert.rs
@@ -163,7 +163,7 @@ fn upsert(
if let Value::Closure { val, .. } = replacement {
match (cell_path.members.first(), &mut value) {
(Some(PathMember::String { .. }), Value::List { vals, .. }) => {
- let mut closure = ClosureEval::new(engine_state, stack, val);
+ let mut closure = ClosureEval::new(engine_state, stack, *val);
for val in vals {
upsert_value_by_closure(
val,
@@ -177,7 +177,7 @@ fn upsert(
(first, _) => {
upsert_single_value_by_closure(
&mut value,
- ClosureEvalOnce::new(engine_state, stack, val),
+ ClosureEvalOnce::new(engine_state, stack, *val),
head,
&cell_path.members,
matches!(first, Some(PathMember::Int { .. })),
@@ -216,7 +216,7 @@ fn upsert(
let value = if path.is_empty() {
let value = stream.next().unwrap_or(Value::nothing(head));
if let Value::Closure { val, .. } = replacement {
- ClosureEvalOnce::new(engine_state, stack, val)
+ ClosureEvalOnce::new(engine_state, stack, *val)
.run_with_value(value)?
.into_value(head)
} else {
@@ -226,7 +226,7 @@ fn upsert(
if let Value::Closure { val, .. } = replacement {
upsert_single_value_by_closure(
&mut value,
- ClosureEvalOnce::new(engine_state, stack, val),
+ ClosureEvalOnce::new(engine_state, stack, *val),
head,
path,
true,
@@ -249,7 +249,7 @@ fn upsert(
.chain(stream)
.into_pipeline_data_with_metadata(head, engine_state.ctrlc.clone(), metadata))
} else if let Value::Closure { val, .. } = replacement {
- let mut closure = ClosureEval::new(engine_state, stack, val);
+ let mut closure = ClosureEval::new(engine_state, stack, *val);
let stream = stream.map(move |mut value| {
let err = upsert_value_by_closure(
&mut value,
diff --git a/crates/nu-command/src/filters/zip.rs b/crates/nu-command/src/filters/zip.rs
index f4ee739f50..9d81451ed4 100644
--- a/crates/nu-command/src/filters/zip.rs
+++ b/crates/nu-command/src/filters/zip.rs
@@ -103,7 +103,7 @@ impl Command for Zip {
let metadata = input.metadata();
let other = if let Value::Closure { val, .. } = other {
// If a closure was provided, evaluate it and consume its stream output
- ClosureEvalOnce::new(engine_state, stack, val).run_with_input(PipelineData::Empty)?
+ ClosureEvalOnce::new(engine_state, stack, *val).run_with_input(PipelineData::Empty)?
} else {
other.into_pipeline_data()
};
diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index 3f77d85477..0fb7b95b4c 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -106,7 +106,7 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
let span = value.span();
match value {
Value::Closure { val, .. } => {
- ClosureEvalOnce::new(&self.engine_state, &self.stack, val)
+ ClosureEvalOnce::new(&self.engine_state, &self.stack, *val)
.run_with_input(PipelineData::Empty)
.map(|data| data.into_value(span))
.unwrap_or_else(|err| Value::error(err, self.call.head))
diff --git a/crates/nu-protocol/src/pipeline_data/mod.rs b/crates/nu-protocol/src/pipeline_data/mod.rs
index 71c667fa70..5b36cf871f 100644
--- a/crates/nu-protocol/src/pipeline_data/mod.rs
+++ b/crates/nu-protocol/src/pipeline_data/mod.rs
@@ -421,7 +421,7 @@ impl PipelineData {
)
.into_iter(),
),
- Value::Range { val, .. } => PipelineIteratorInner::ListStream(
+ Value::Range { ref val, .. } => PipelineIteratorInner::ListStream(
ListStream::new(val.into_range_iter(value.span(), None), val_span, None)
.into_iter(),
),
@@ -801,7 +801,7 @@ impl PipelineData {
let span = v.span();
match v {
Value::Range { val, .. } => {
- match val {
+ match *val {
Range::IntRange(range) => {
if range.is_unbounded() {
return Err(ShellError::GenericError {
diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs
index 9fc9d4c8b6..97fb95d482 100644
--- a/crates/nu-protocol/src/value/from_value.rs
+++ b/crates/nu-protocol/src/value/from_value.rs
@@ -442,7 +442,7 @@ impl FromValue for Spanned> {
impl FromValue for Range {
fn from_value(v: Value) -> Result {
match v {
- Value::Range { val, .. } => Ok(val),
+ Value::Range { val, .. } => Ok(*val),
v => Err(ShellError::CantConvert {
to_type: "range".into(),
from_type: v.get_type().to_string(),
@@ -457,7 +457,7 @@ impl FromValue for Spanned {
fn from_value(v: Value) -> Result {
let span = v.span();
match v {
- Value::Range { val, .. } => Ok(Spanned { item: val, span }),
+ Value::Range { val, .. } => Ok(Spanned { item: *val, span }),
v => Err(ShellError::CantConvert {
to_type: "range".into(),
from_type: v.get_type().to_string(),
@@ -552,7 +552,7 @@ impl FromValue for Record {
impl FromValue for Closure {
fn from_value(v: Value) -> Result {
match v {
- Value::Closure { val, .. } => Ok(val),
+ Value::Closure { val, .. } => Ok(*val),
v => Err(ShellError::CantConvert {
to_type: "Closure".into(),
from_type: v.get_type().to_string(),
@@ -567,7 +567,7 @@ impl FromValue for Spanned {
fn from_value(v: Value) -> Result {
let span = v.span();
match v {
- Value::Closure { val, .. } => Ok(Spanned { item: val, span }),
+ Value::Closure { val, .. } => Ok(Spanned { item: *val, span }),
v => Err(ShellError::CantConvert {
to_type: "Closure".into(),
from_type: v.get_type().to_string(),
diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs
index dbfa93b793..f924218b79 100644
--- a/crates/nu-protocol/src/value/mod.rs
+++ b/crates/nu-protocol/src/value/mod.rs
@@ -86,7 +86,7 @@ pub enum Value {
internal_span: Span,
},
Range {
- val: Range,
+ val: Box,
// note: spans are being refactored out of Value
// please use .span() instead of matching this span value
#[serde(rename = "span")]
@@ -122,7 +122,7 @@ pub enum Value {
internal_span: Span,
},
Closure {
- val: Closure,
+ val: Box,
// note: spans are being refactored out of Value
// please use .span() instead of matching this span value
#[serde(rename = "span")]
@@ -182,7 +182,7 @@ impl Clone for Value {
internal_span: *internal_span,
},
Value::Range { val, internal_span } => Value::Range {
- val: *val,
+ val: val.clone(),
internal_span: *internal_span,
},
Value::Float { val, internal_span } => Value::float(*val, *internal_span),
@@ -327,7 +327,7 @@ impl Value {
/// Returns a reference to the inner [`Range`] value or an error if this `Value` is not a range
pub fn as_range(&self) -> Result {
if let Value::Range { val, .. } = self {
- Ok(*val)
+ Ok(**val)
} else {
self.cant_convert_to("range")
}
@@ -336,7 +336,7 @@ impl Value {
/// Unwraps the inner [`Range`] value or returns an error if this `Value` is not a range
pub fn into_range(self) -> Result {
if let Value::Range { val, .. } = self {
- Ok(val)
+ Ok(*val)
} else {
self.cant_convert_to("range")
}
@@ -553,7 +553,7 @@ impl Value {
/// Unwraps the inner [`Closure`] value or returns an error if this `Value` is not a closure
pub fn into_closure(self) -> Result {
if let Value::Closure { val, .. } = self {
- Ok(val)
+ Ok(*val)
} else {
self.cant_convert_to("closure")
}
@@ -1012,7 +1012,7 @@ impl Value {
});
}
}
- Value::Range { val, .. } => {
+ Value::Range { ref val, .. } => {
if let Some(item) =
val.into_range_iter(current.span(), None).nth(*count)
{
@@ -1826,7 +1826,7 @@ impl Value {
pub fn range(val: Range, span: Span) -> Value {
Value::Range {
- val,
+ val: val.into(),
internal_span: span,
}
}
@@ -1862,7 +1862,7 @@ impl Value {
pub fn closure(val: Closure, span: Span) -> Value {
Value::Closure {
- val,
+ val: val.into(),
internal_span: span,
}
}
diff --git a/crates/nuon/src/to.rs b/crates/nuon/src/to.rs
index 8aeb47a097..57f208dcc0 100644
--- a/crates/nuon/src/to.rs
+++ b/crates/nuon/src/to.rs
@@ -176,7 +176,7 @@ fn value_to_string(
}
}
Value::Nothing { .. } => Ok("null".to_string()),
- Value::Range { val, .. } => match val {
+ Value::Range { val, .. } => match **val {
Range::IntRange(range) => Ok(range.to_string()),
Range::FloatRange(range) => {
let start =
From 948b299e657004bed7af788e5423f32c7ab5526f Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Thu, 9 May 2024 02:16:57 +0000
Subject: [PATCH 08/42] Fix/simplify cwd in benchmarks (#12812)
# Description
The benchmarks currently panic when trying to set the initial CWD. This
is because the code that sets the CWD also tries to get the CWD.
---
benches/benchmarks.rs | 35 +++++++----------------------------
1 file changed, 7 insertions(+), 28 deletions(-)
diff --git a/benches/benchmarks.rs b/benches/benchmarks.rs
index e291eeebcc..9de7cc5758 100644
--- a/benches/benchmarks.rs
+++ b/benches/benchmarks.rs
@@ -9,10 +9,7 @@ use nu_protocol::{
};
use nu_std::load_standard_library;
use nu_utils::{get_default_config, get_default_env};
-use std::{
- path::{Path, PathBuf},
- rc::Rc,
-};
+use std::rc::Rc;
use std::hint::black_box;
@@ -22,34 +19,16 @@ fn load_bench_commands() -> EngineState {
nu_command::add_shell_command_context(nu_cmd_lang::create_default_context())
}
-fn canonicalize_path(engine_state: &EngineState, path: &Path) -> PathBuf {
- let cwd = engine_state.cwd_as_string(None).unwrap();
-
- if path.exists() {
- match nu_path::canonicalize_with(path, cwd) {
- Ok(canon_path) => canon_path,
- Err(_) => path.to_owned(),
- }
- } else {
- path.to_owned()
- }
-}
-
-fn get_home_path(engine_state: &EngineState) -> PathBuf {
- nu_path::home_dir()
- .map(|path| canonicalize_path(engine_state, &path))
- .unwrap_or_default()
-}
-
fn setup_engine() -> EngineState {
let mut engine_state = load_bench_commands();
- let home_path = get_home_path(&engine_state);
+ let cwd = std::env::current_dir()
+ .unwrap()
+ .into_os_string()
+ .into_string()
+ .unwrap();
// parsing config.nu breaks without PWD set, so set a valid path
- engine_state.add_env_var(
- "PWD".into(),
- Value::string(home_path.to_string_lossy(), Span::test_data()),
- );
+ engine_state.add_env_var("PWD".into(), Value::string(cwd, Span::test_data()));
let nu_const = create_nu_constant(&engine_state, Span::unknown())
.expect("Failed to create nushell constant.");
From 3b3f48202c10ceb29fea346e6dd76e07cdb80766 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Thu, 9 May 2024 05:36:47 +0000
Subject: [PATCH 09/42] Refactor message printing in `rm` (#12799)
# Description
Changes the iterator in `rm` to be an iterator over
`Result, ShellError>` (an optional message or error)
instead of an iterator over `Value`. Then, the iterator is consumed and
each message is printed. This allows the
`PipelineData::print_not_formatted` method to be removed.
---
crates/nu-command/src/filesystem/rm.rs | 236 ++++++++++----------
crates/nu-protocol/src/pipeline_data/mod.rs | 26 ---
2 files changed, 116 insertions(+), 146 deletions(-)
diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs
index 9b9e88b5ff..9696ae0c2f 100644
--- a/crates/nu-command/src/filesystem/rm.rs
+++ b/crates/nu-command/src/filesystem/rm.rs
@@ -3,7 +3,7 @@ use super::util::{get_rest_for_glob_pattern, try_interaction};
use nu_engine::{command_prelude::*, env::current_dir};
use nu_glob::MatchOptions;
use nu_path::expand_path_with;
-use nu_protocol::NuGlob;
+use nu_protocol::{report_error_new, NuGlob};
#[cfg(unix)]
use std::os::unix::prelude::FileTypeExt;
use std::{
@@ -118,8 +118,6 @@ fn rm(
let interactive = call.has_flag(engine_state, stack, "interactive")?;
let interactive_once = call.has_flag(engine_state, stack, "interactive-once")? && !interactive;
- let ctrlc = engine_state.ctrlc.clone();
-
let mut paths = get_rest_for_glob_pattern(engine_state, stack, call, 0)?;
if paths.is_empty() {
@@ -341,132 +339,130 @@ fn rm(
}
}
- all_targets
- .into_iter()
- .map(move |(f, span)| {
- let is_empty = || match f.read_dir() {
- Ok(mut p) => p.next().is_none(),
- Err(_) => false,
- };
+ let iter = all_targets.into_iter().map(move |(f, span)| {
+ let is_empty = || match f.read_dir() {
+ Ok(mut p) => p.next().is_none(),
+ Err(_) => false,
+ };
- if let Ok(metadata) = f.symlink_metadata() {
- #[cfg(unix)]
- let is_socket = metadata.file_type().is_socket();
- #[cfg(unix)]
- let is_fifo = metadata.file_type().is_fifo();
+ if let Ok(metadata) = f.symlink_metadata() {
+ #[cfg(unix)]
+ let is_socket = metadata.file_type().is_socket();
+ #[cfg(unix)]
+ let is_fifo = metadata.file_type().is_fifo();
- #[cfg(not(unix))]
- let is_socket = false;
- #[cfg(not(unix))]
- let is_fifo = false;
+ #[cfg(not(unix))]
+ let is_socket = false;
+ #[cfg(not(unix))]
+ let is_fifo = false;
- if metadata.is_file()
- || metadata.file_type().is_symlink()
- || recursive
- || is_socket
- || is_fifo
- || is_empty()
- {
- let (interaction, confirmed) = try_interaction(
- interactive,
- format!("rm: remove '{}'? ", f.to_string_lossy()),
- );
+ if metadata.is_file()
+ || metadata.file_type().is_symlink()
+ || recursive
+ || is_socket
+ || is_fifo
+ || is_empty()
+ {
+ let (interaction, confirmed) = try_interaction(
+ interactive,
+ format!("rm: remove '{}'? ", f.to_string_lossy()),
+ );
- let result = if let Err(e) = interaction {
- let e = Error::new(ErrorKind::Other, &*e.to_string());
- Err(e)
- } else if interactive && !confirmed {
- Ok(())
- } else if TRASH_SUPPORTED && (trash || (rm_always_trash && !permanent)) {
- #[cfg(all(
- feature = "trash-support",
- not(any(target_os = "android", target_os = "ios"))
- ))]
- {
- trash::delete(&f).map_err(|e: trash::Error| {
- Error::new(
- ErrorKind::Other,
- format!("{e:?}\nTry '--permanent' flag"),
- )
- })
- }
-
- // Should not be reachable since we error earlier if
- // these options are given on an unsupported platform
- #[cfg(any(
- not(feature = "trash-support"),
- target_os = "android",
- target_os = "ios"
- ))]
- {
- unreachable!()
- }
- } else if metadata.is_symlink() {
- // In Windows, symlink pointing to a directory can be removed using
- // std::fs::remove_dir instead of std::fs::remove_file.
- #[cfg(windows)]
- {
- f.metadata().and_then(|metadata| {
- if metadata.is_dir() {
- std::fs::remove_dir(&f)
- } else {
- std::fs::remove_file(&f)
- }
- })
- }
-
- #[cfg(not(windows))]
- std::fs::remove_file(&f)
- } else if metadata.is_file() || is_socket || is_fifo {
- std::fs::remove_file(&f)
- } else {
- std::fs::remove_dir_all(&f)
- };
-
- if let Err(e) = result {
- let msg = format!("Could not delete {:}: {e:}", f.to_string_lossy());
- Value::error(ShellError::RemoveNotPossible { msg, span }, span)
- } else if verbose {
- let msg = if interactive && !confirmed {
- "not deleted"
- } else {
- "deleted"
- };
- let val = format!("{} {:}", msg, f.to_string_lossy());
- Value::string(val, span)
- } else {
- Value::nothing(span)
+ let result = if let Err(e) = interaction {
+ Err(Error::new(ErrorKind::Other, &*e.to_string()))
+ } else if interactive && !confirmed {
+ Ok(())
+ } else if TRASH_SUPPORTED && (trash || (rm_always_trash && !permanent)) {
+ #[cfg(all(
+ feature = "trash-support",
+ not(any(target_os = "android", target_os = "ios"))
+ ))]
+ {
+ trash::delete(&f).map_err(|e: trash::Error| {
+ Error::new(ErrorKind::Other, format!("{e:?}\nTry '--permanent' flag"))
+ })
}
+
+ // Should not be reachable since we error earlier if
+ // these options are given on an unsupported platform
+ #[cfg(any(
+ not(feature = "trash-support"),
+ target_os = "android",
+ target_os = "ios"
+ ))]
+ {
+ unreachable!()
+ }
+ } else if metadata.is_symlink() {
+ // In Windows, symlink pointing to a directory can be removed using
+ // std::fs::remove_dir instead of std::fs::remove_file.
+ #[cfg(windows)]
+ {
+ f.metadata().and_then(|metadata| {
+ if metadata.is_dir() {
+ std::fs::remove_dir(&f)
+ } else {
+ std::fs::remove_file(&f)
+ }
+ })
+ }
+
+ #[cfg(not(windows))]
+ std::fs::remove_file(&f)
+ } else if metadata.is_file() || is_socket || is_fifo {
+ std::fs::remove_file(&f)
} else {
- let error = format!("Cannot remove {:}. try --recursive", f.to_string_lossy());
- Value::error(
- ShellError::GenericError {
- error,
- msg: "cannot remove non-empty directory".into(),
- span: Some(span),
- help: None,
- inner: vec![],
- },
- span,
- )
+ std::fs::remove_dir_all(&f)
+ };
+
+ if let Err(e) = result {
+ let msg = format!("Could not delete {:}: {e:}", f.to_string_lossy());
+ Err(ShellError::RemoveNotPossible { msg, span })
+ } else if verbose {
+ let msg = if interactive && !confirmed {
+ "not deleted"
+ } else {
+ "deleted"
+ };
+ Ok(Some(format!("{} {:}", msg, f.to_string_lossy())))
+ } else {
+ Ok(None)
}
} else {
- let error = format!("no such file or directory: {:}", f.to_string_lossy());
- Value::error(
- ShellError::GenericError {
- error,
- msg: "no such file or directory".into(),
- span: Some(span),
- help: None,
- inner: vec![],
- },
- span,
- )
+ let error = format!("Cannot remove {:}. try --recursive", f.to_string_lossy());
+ Err(ShellError::GenericError {
+ error,
+ msg: "cannot remove non-empty directory".into(),
+ span: Some(span),
+ help: None,
+ inner: vec![],
+ })
}
- })
- .filter(|x| !matches!(x.get_type(), Type::Nothing))
- .into_pipeline_data(span, ctrlc)
- .print_not_formatted(engine_state, false, true)?;
+ } else {
+ let error = format!("no such file or directory: {:}", f.to_string_lossy());
+ Err(ShellError::GenericError {
+ error,
+ msg: "no such file or directory".into(),
+ span: Some(span),
+ help: None,
+ inner: vec![],
+ })
+ }
+ });
+
+ for result in iter {
+ if nu_utils::ctrl_c::was_pressed(&engine_state.ctrlc) {
+ return Err(ShellError::InterruptedByUser {
+ span: Some(call.head),
+ });
+ }
+
+ match result {
+ Ok(None) => {}
+ Ok(Some(msg)) => eprintln!("{msg}"),
+ Err(err) => report_error_new(engine_state, &err),
+ }
+ }
Ok(PipelineData::empty())
}
diff --git a/crates/nu-protocol/src/pipeline_data/mod.rs b/crates/nu-protocol/src/pipeline_data/mod.rs
index 5b36cf871f..297eb19c55 100644
--- a/crates/nu-protocol/src/pipeline_data/mod.rs
+++ b/crates/nu-protocol/src/pipeline_data/mod.rs
@@ -877,32 +877,6 @@ impl PipelineData {
Ok(0)
}
- /// Consume and print self data immediately.
- ///
- /// Unlike [`.print()`] does not call `table` to format data and just prints it
- /// one element on a line
- /// * `no_newline` controls if we need to attach newline character to output.
- /// * `to_stderr` controls if data is output to stderr, when the value is false, the data is output to stdout.
- pub fn print_not_formatted(
- self,
- engine_state: &EngineState,
- no_newline: bool,
- to_stderr: bool,
- ) -> Result {
- if let PipelineData::ExternalStream {
- stdout: stream,
- stderr: stderr_stream,
- exit_code,
- ..
- } = self
- {
- print_if_stream(stream, stderr_stream, to_stderr, exit_code)
- } else {
- let config = engine_state.get_config();
- self.write_all_and_flush(engine_state, config, no_newline, to_stderr)
- }
- }
-
fn write_all_and_flush(
self,
engine_state: &EngineState,
From 7271ad7909445ad714063b0dedd4b6719b0a4f59 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Thu, 9 May 2024 05:38:24 +0000
Subject: [PATCH 10/42] Pass `Stack` ref to `Completer::fetch` (#12783)
# Description
Adds an additional `&Stack` parameter to `Completer::fetch` so that the
completers don't have to store a `Stack` themselves. I also removed
unnecessary `EngineState`s from the completers, since the same
`EngineState` is available in the `working_set.permanent_state` also
passed to `Completer::fetch`.
---
crates/nu-cli/src/completions/base.rs | 7 +-
.../src/completions/command_completions.rs | 20 +++---
crates/nu-cli/src/completions/completer.rs | 54 +++++----------
.../src/completions/custom_completions.rs | 15 ++--
.../src/completions/directory_completions.rs | 28 +++-----
.../src/completions/dotnu_completions.rs | 69 ++++++++-----------
.../src/completions/file_completions.rs | 28 +++-----
.../src/completions/flag_completions.rs | 5 +-
.../src/completions/variable_completions.rs | 35 ++++------
crates/nu-cli/src/repl.rs | 2 +-
crates/nu-cli/tests/completions.rs | 59 ++++++++--------
crates/nu-lsp/src/lib.rs | 4 +-
src/ide.rs | 3 +-
13 files changed, 146 insertions(+), 183 deletions(-)
diff --git a/crates/nu-cli/src/completions/base.rs b/crates/nu-cli/src/completions/base.rs
index c4290b8767..0debabe688 100644
--- a/crates/nu-cli/src/completions/base.rs
+++ b/crates/nu-cli/src/completions/base.rs
@@ -1,13 +1,18 @@
use crate::completions::{CompletionOptions, SortBy};
-use nu_protocol::{engine::StateWorkingSet, levenshtein_distance, Span};
+use nu_protocol::{
+ engine::{Stack, StateWorkingSet},
+ levenshtein_distance, Span,
+};
use reedline::Suggestion;
// Completer trait represents the three stages of the completion
// fetch, filter and sort
pub trait Completer {
+ #[allow(clippy::too_many_arguments)]
fn fetch(
&mut self,
working_set: &StateWorkingSet,
+ stack: &Stack,
prefix: Vec,
span: Span,
offset: usize,
diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs
index 42094f9c97..2549854540 100644
--- a/crates/nu-cli/src/completions/command_completions.rs
+++ b/crates/nu-cli/src/completions/command_completions.rs
@@ -4,16 +4,14 @@ use crate::{
};
use nu_parser::FlatShape;
use nu_protocol::{
- engine::{CachedFile, EngineState, StateWorkingSet},
+ engine::{CachedFile, Stack, StateWorkingSet},
Span,
};
use reedline::Suggestion;
-use std::sync::Arc;
use super::SemanticSuggestion;
pub struct CommandCompletion {
- engine_state: Arc,
flattened: Vec<(Span, FlatShape)>,
flat_shape: FlatShape,
force_completion_after_space: bool,
@@ -21,14 +19,11 @@ pub struct CommandCompletion {
impl CommandCompletion {
pub fn new(
- engine_state: Arc,
- _: &StateWorkingSet,
flattened: Vec<(Span, FlatShape)>,
flat_shape: FlatShape,
force_completion_after_space: bool,
) -> Self {
Self {
- engine_state,
flattened,
flat_shape,
force_completion_after_space,
@@ -37,13 +32,14 @@ impl CommandCompletion {
fn external_command_completion(
&self,
+ working_set: &StateWorkingSet,
prefix: &str,
match_algorithm: MatchAlgorithm,
) -> Vec {
let mut executables = vec![];
// os agnostic way to get the PATH env var
- let paths = self.engine_state.get_path_env_var();
+ let paths = working_set.permanent_state.get_path_env_var();
if let Some(paths) = paths {
if let Ok(paths) = paths.as_list() {
@@ -52,7 +48,10 @@ impl CommandCompletion {
if let Ok(mut contents) = std::fs::read_dir(path.as_ref()) {
while let Some(Ok(item)) = contents.next() {
- if self.engine_state.config.max_external_completion_results
+ if working_set
+ .permanent_state
+ .config
+ .max_external_completion_results
> executables.len() as i64
&& !executables.contains(
&item
@@ -114,7 +113,7 @@ impl CommandCompletion {
if find_externals {
let results_external = self
- .external_command_completion(&partial, match_algorithm)
+ .external_command_completion(working_set, &partial, match_algorithm)
.into_iter()
.map(move |x| SemanticSuggestion {
suggestion: Suggestion {
@@ -161,6 +160,7 @@ impl Completer for CommandCompletion {
fn fetch(
&mut self,
working_set: &StateWorkingSet,
+ _stack: &Stack,
_prefix: Vec,
span: Span,
offset: usize,
@@ -266,6 +266,8 @@ pub fn is_passthrough_command(working_set_file_contents: &[CachedFile]) -> bool
#[cfg(test)]
mod command_completions_tests {
use super::*;
+ use nu_protocol::engine::EngineState;
+ use std::sync::Arc;
#[test]
fn test_find_non_whitespace_index() {
diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 5837772d54..348111f009 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -22,10 +22,10 @@ pub struct NuCompleter {
}
impl NuCompleter {
- pub fn new(engine_state: Arc, stack: Stack) -> Self {
+ pub fn new(engine_state: Arc, stack: Arc) -> Self {
Self {
engine_state,
- stack: stack.reset_out_dest().capture(),
+ stack: Stack::with_parent(stack).reset_out_dest().capture(),
}
}
@@ -52,8 +52,15 @@ impl NuCompleter {
};
// Fetch
- let mut suggestions =
- completer.fetch(working_set, prefix.clone(), new_span, offset, pos, &options);
+ let mut suggestions = completer.fetch(
+ working_set,
+ &self.stack,
+ prefix.clone(),
+ new_span,
+ offset,
+ pos,
+ &options,
+ );
// Sort
suggestions = completer.sort(suggestions, prefix);
@@ -175,11 +182,8 @@ impl NuCompleter {
// Variables completion
if prefix.starts_with(b"$") || most_left_var.is_some() {
- let mut completer = VariableCompletion::new(
- self.engine_state.clone(),
- self.stack.clone(),
- most_left_var.unwrap_or((vec![], vec![])),
- );
+ let mut completer =
+ VariableCompletion::new(most_left_var.unwrap_or((vec![], vec![])));
return self.process_completion(
&mut completer,
@@ -224,8 +228,6 @@ impl NuCompleter {
|| (flat_idx == 0 && working_set.get_span_contents(new_span).is_empty())
{
let mut completer = CommandCompletion::new(
- self.engine_state.clone(),
- &working_set,
flattened.clone(),
// flat_idx,
FlatShape::String,
@@ -253,10 +255,7 @@ impl NuCompleter {
|| prev_expr_str == b"overlay use"
|| prev_expr_str == b"source-env"
{
- let mut completer = DotNuCompletion::new(
- self.engine_state.clone(),
- self.stack.clone(),
- );
+ let mut completer = DotNuCompletion::new();
return self.process_completion(
&mut completer,
@@ -267,10 +266,7 @@ impl NuCompleter {
pos,
);
} else if prev_expr_str == b"ls" {
- let mut completer = FileCompletion::new(
- self.engine_state.clone(),
- self.stack.clone(),
- );
+ let mut completer = FileCompletion::new();
return self.process_completion(
&mut completer,
@@ -288,7 +284,6 @@ impl NuCompleter {
match &flat.1 {
FlatShape::Custom(decl_id) => {
let mut completer = CustomCompletion::new(
- self.engine_state.clone(),
self.stack.clone(),
*decl_id,
initial_line,
@@ -304,10 +299,7 @@ impl NuCompleter {
);
}
FlatShape::Directory => {
- let mut completer = DirectoryCompletion::new(
- self.engine_state.clone(),
- self.stack.clone(),
- );
+ let mut completer = DirectoryCompletion::new();
return self.process_completion(
&mut completer,
@@ -319,10 +311,7 @@ impl NuCompleter {
);
}
FlatShape::Filepath | FlatShape::GlobPattern => {
- let mut completer = FileCompletion::new(
- self.engine_state.clone(),
- self.stack.clone(),
- );
+ let mut completer = FileCompletion::new();
return self.process_completion(
&mut completer,
@@ -335,8 +324,6 @@ impl NuCompleter {
}
flat_shape => {
let mut completer = CommandCompletion::new(
- self.engine_state.clone(),
- &working_set,
flattened.clone(),
// flat_idx,
flat_shape.clone(),
@@ -369,10 +356,7 @@ impl NuCompleter {
}
// Check for file completion
- let mut completer = FileCompletion::new(
- self.engine_state.clone(),
- self.stack.clone(),
- );
+ let mut completer = FileCompletion::new();
out = self.process_completion(
&mut completer,
&working_set,
@@ -557,7 +541,7 @@ mod completer_tests {
result.err().unwrap()
);
- let mut completer = NuCompleter::new(engine_state.into(), Stack::new());
+ let mut completer = NuCompleter::new(engine_state.into(), Arc::new(Stack::new()));
let dataset = [
("sudo", false, "", Vec::new()),
("sudo l", true, "l", vec!["ls", "let", "lines", "loop"]),
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index 12a7762e94..d2ccd5191d 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -6,14 +6,13 @@ use nu_engine::eval_call;
use nu_protocol::{
ast::{Argument, Call, Expr, Expression},
debugger::WithoutDebug,
- engine::{EngineState, Stack, StateWorkingSet},
+ engine::{Stack, StateWorkingSet},
PipelineData, Span, Type, Value,
};
use nu_utils::IgnoreCaseExt;
-use std::{collections::HashMap, sync::Arc};
+use std::collections::HashMap;
pub struct CustomCompletion {
- engine_state: Arc,
stack: Stack,
decl_id: usize,
line: String,
@@ -21,10 +20,9 @@ pub struct CustomCompletion {
}
impl CustomCompletion {
- pub fn new(engine_state: Arc, stack: Stack, decl_id: usize, line: String) -> Self {
+ pub fn new(stack: Stack, decl_id: usize, line: String) -> Self {
Self {
- engine_state,
- stack: stack.reset_out_dest().capture(),
+ stack,
decl_id,
line,
sort_by: SortBy::None,
@@ -35,7 +33,8 @@ impl CustomCompletion {
impl Completer for CustomCompletion {
fn fetch(
&mut self,
- _: &StateWorkingSet,
+ working_set: &StateWorkingSet,
+ _stack: &Stack,
prefix: Vec,
span: Span,
offset: usize,
@@ -47,7 +46,7 @@ impl Completer for CustomCompletion {
// Call custom declaration
let result = eval_call::(
- &self.engine_state,
+ working_set.permanent_state,
&mut self.stack,
&Call {
decl_id: self.decl_id,
diff --git a/crates/nu-cli/src/completions/directory_completions.rs b/crates/nu-cli/src/completions/directory_completions.rs
index e8d463c19f..024322f997 100644
--- a/crates/nu-cli/src/completions/directory_completions.rs
+++ b/crates/nu-cli/src/completions/directory_completions.rs
@@ -8,25 +8,16 @@ use nu_protocol::{
levenshtein_distance, Span,
};
use reedline::Suggestion;
-use std::{
- path::{Path, MAIN_SEPARATOR as SEP},
- sync::Arc,
-};
+use std::path::{Path, MAIN_SEPARATOR as SEP};
use super::SemanticSuggestion;
-#[derive(Clone)]
-pub struct DirectoryCompletion {
- engine_state: Arc,
- stack: Stack,
-}
+#[derive(Clone, Default)]
+pub struct DirectoryCompletion {}
impl DirectoryCompletion {
- pub fn new(engine_state: Arc, stack: Stack) -> Self {
- Self {
- engine_state,
- stack,
- }
+ pub fn new() -> Self {
+ Self::default()
}
}
@@ -34,10 +25,11 @@ impl Completer for DirectoryCompletion {
fn fetch(
&mut self,
working_set: &StateWorkingSet,
+ stack: &Stack,
prefix: Vec,
span: Span,
offset: usize,
- _: usize,
+ _pos: usize,
options: &CompletionOptions,
) -> Vec {
let AdjustView { prefix, span, .. } = adjust_if_intermediate(&prefix, working_set, span);
@@ -47,10 +39,10 @@ impl Completer for DirectoryCompletion {
let output: Vec<_> = directory_completion(
span,
&prefix,
- &self.engine_state.current_work_dir(),
+ &working_set.permanent_state.current_work_dir(),
options,
- self.engine_state.as_ref(),
- &self.stack,
+ working_set.permanent_state,
+ stack,
)
.into_iter()
.map(move |x| SemanticSuggestion {
diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs
index 8927738491..c939578b41 100644
--- a/crates/nu-cli/src/completions/dotnu_completions.rs
+++ b/crates/nu-cli/src/completions/dotnu_completions.rs
@@ -1,39 +1,31 @@
use crate::completions::{file_path_completion, Completer, CompletionOptions, SortBy};
use nu_protocol::{
- engine::{EngineState, Stack, StateWorkingSet},
+ engine::{Stack, StateWorkingSet},
Span,
};
use reedline::Suggestion;
-use std::{
- path::{is_separator, Path, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR},
- sync::Arc,
-};
+use std::path::{is_separator, Path, MAIN_SEPARATOR as SEP, MAIN_SEPARATOR_STR};
use super::SemanticSuggestion;
-#[derive(Clone)]
-pub struct DotNuCompletion {
- engine_state: Arc,
- stack: Stack,
-}
+#[derive(Clone, Default)]
+pub struct DotNuCompletion {}
impl DotNuCompletion {
- pub fn new(engine_state: Arc, stack: Stack) -> Self {
- Self {
- engine_state,
- stack,
- }
+ pub fn new() -> Self {
+ Self::default()
}
}
impl Completer for DotNuCompletion {
fn fetch(
&mut self,
- _: &StateWorkingSet,
+ working_set: &StateWorkingSet,
+ stack: &Stack,
prefix: Vec,
span: Span,
offset: usize,
- _: usize,
+ _pos: usize,
options: &CompletionOptions,
) -> Vec {
let prefix_str = String::from_utf8_lossy(&prefix).replace('`', "");
@@ -49,26 +41,25 @@ impl Completer for DotNuCompletion {
let mut is_current_folder = false;
// Fetch the lib dirs
- let lib_dirs: Vec =
- if let Some(lib_dirs) = self.engine_state.get_env_var("NU_LIB_DIRS") {
- lib_dirs
- .as_list()
- .into_iter()
- .flat_map(|it| {
- it.iter().map(|x| {
- x.to_path()
- .expect("internal error: failed to convert lib path")
- })
+ let lib_dirs: Vec = if let Some(lib_dirs) = working_set.get_env_var("NU_LIB_DIRS") {
+ lib_dirs
+ .as_list()
+ .into_iter()
+ .flat_map(|it| {
+ it.iter().map(|x| {
+ x.to_path()
+ .expect("internal error: failed to convert lib path")
})
- .map(|it| {
- it.into_os_string()
- .into_string()
- .expect("internal error: failed to convert OS path")
- })
- .collect()
- } else {
- vec![]
- };
+ })
+ .map(|it| {
+ it.into_os_string()
+ .into_string()
+ .expect("internal error: failed to convert OS path")
+ })
+ .collect()
+ } else {
+ vec![]
+ };
// Check if the base_dir is a folder
// rsplit_once removes the separator
@@ -85,7 +76,7 @@ impl Completer for DotNuCompletion {
} else {
// Fetch the current folder
#[allow(deprecated)]
- let current_folder = self.engine_state.current_work_dir();
+ let current_folder = working_set.permanent_state.current_work_dir();
is_current_folder = true;
// Add the current folder and the lib dirs into the
@@ -104,8 +95,8 @@ impl Completer for DotNuCompletion {
&partial,
&search_dir,
options,
- self.engine_state.as_ref(),
- &self.stack,
+ working_set.permanent_state,
+ stack,
);
completions
.into_iter()
diff --git a/crates/nu-cli/src/completions/file_completions.rs b/crates/nu-cli/src/completions/file_completions.rs
index 1a99c995db..f6205f6792 100644
--- a/crates/nu-cli/src/completions/file_completions.rs
+++ b/crates/nu-cli/src/completions/file_completions.rs
@@ -9,25 +9,16 @@ use nu_protocol::{
};
use nu_utils::IgnoreCaseExt;
use reedline::Suggestion;
-use std::{
- path::{Path, MAIN_SEPARATOR as SEP},
- sync::Arc,
-};
+use std::path::{Path, MAIN_SEPARATOR as SEP};
use super::SemanticSuggestion;
-#[derive(Clone)]
-pub struct FileCompletion {
- engine_state: Arc,
- stack: Stack,
-}
+#[derive(Clone, Default)]
+pub struct FileCompletion {}
impl FileCompletion {
- pub fn new(engine_state: Arc, stack: Stack) -> Self {
- Self {
- engine_state,
- stack,
- }
+ pub fn new() -> Self {
+ Self::default()
}
}
@@ -35,10 +26,11 @@ impl Completer for FileCompletion {
fn fetch(
&mut self,
working_set: &StateWorkingSet,
+ stack: &Stack,
prefix: Vec,
span: Span,
offset: usize,
- _: usize,
+ _pos: usize,
options: &CompletionOptions,
) -> Vec {
let AdjustView {
@@ -52,10 +44,10 @@ impl Completer for FileCompletion {
readjusted,
span,
&prefix,
- &self.engine_state.current_work_dir(),
+ &working_set.permanent_state.current_work_dir(),
options,
- self.engine_state.as_ref(),
- &self.stack,
+ working_set.permanent_state,
+ stack,
)
.into_iter()
.map(move |x| SemanticSuggestion {
diff --git a/crates/nu-cli/src/completions/flag_completions.rs b/crates/nu-cli/src/completions/flag_completions.rs
index 07cd89dc0a..b0dcc0963b 100644
--- a/crates/nu-cli/src/completions/flag_completions.rs
+++ b/crates/nu-cli/src/completions/flag_completions.rs
@@ -1,7 +1,7 @@
use crate::completions::{Completer, CompletionOptions};
use nu_protocol::{
ast::{Expr, Expression},
- engine::StateWorkingSet,
+ engine::{Stack, StateWorkingSet},
Span,
};
use reedline::Suggestion;
@@ -23,10 +23,11 @@ impl Completer for FlagCompletion {
fn fetch(
&mut self,
working_set: &StateWorkingSet,
+ _stack: &Stack,
prefix: Vec,
span: Span,
offset: usize,
- _: usize,
+ _pos: usize,
options: &CompletionOptions,
) -> Vec {
// Check if it's a flag
diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs
index b869e9f972..0572fe93c1 100644
--- a/crates/nu-cli/src/completions/variable_completions.rs
+++ b/crates/nu-cli/src/completions/variable_completions.rs
@@ -3,30 +3,20 @@ use crate::completions::{
};
use nu_engine::{column::get_columns, eval_variable};
use nu_protocol::{
- engine::{EngineState, Stack, StateWorkingSet},
+ engine::{Stack, StateWorkingSet},
Span, Value,
};
use reedline::Suggestion;
-use std::{str, sync::Arc};
+use std::str;
#[derive(Clone)]
pub struct VariableCompletion {
- engine_state: Arc, // TODO: Is engine state necessary? It's already a part of working set in fetch()
- stack: Stack,
var_context: (Vec, Vec>), // tuple with $var and the sublevels (.b.c.d)
}
impl VariableCompletion {
- pub fn new(
- engine_state: Arc,
- stack: Stack,
- var_context: (Vec, Vec>),
- ) -> Self {
- Self {
- engine_state,
- stack,
- var_context,
- }
+ pub fn new(var_context: (Vec, Vec>)) -> Self {
+ Self { var_context }
}
}
@@ -34,10 +24,11 @@ impl Completer for VariableCompletion {
fn fetch(
&mut self,
working_set: &StateWorkingSet,
+ stack: &Stack,
prefix: Vec,
span: Span,
offset: usize,
- _: usize,
+ _pos: usize,
options: &CompletionOptions,
) -> Vec {
let mut output = vec![];
@@ -54,7 +45,7 @@ impl Completer for VariableCompletion {
if !var_str.is_empty() {
// Completion for $env.
if var_str == "$env" {
- let env_vars = self.stack.get_env_vars(&self.engine_state);
+ let env_vars = stack.get_env_vars(working_set.permanent_state);
// Return nested values
if sublevels_count > 0 {
@@ -110,8 +101,8 @@ impl Completer for VariableCompletion {
if var_str == "$nu" {
// Eval nu var
if let Ok(nuval) = eval_variable(
- &self.engine_state,
- &self.stack,
+ working_set.permanent_state,
+ stack,
nu_protocol::NU_VARIABLE_ID,
nu_protocol::Span::new(current_span.start, current_span.end),
) {
@@ -133,7 +124,7 @@ impl Completer for VariableCompletion {
// Completion other variable types
if let Some(var_id) = var_id {
// Extract the variable value from the stack
- let var = self.stack.get_var(var_id, Span::new(span.start, span.end));
+ let var = stack.get_var(var_id, Span::new(span.start, span.end));
// If the value exists and it's of type Record
if let Ok(value) = var {
@@ -207,7 +198,11 @@ impl Completer for VariableCompletion {
// Permanent state vars
// for scope in &self.engine_state.scope {
- for overlay_frame in self.engine_state.active_overlays(&removed_overlays).rev() {
+ for overlay_frame in working_set
+ .permanent_state
+ .active_overlays(&removed_overlays)
+ .rev()
+ {
for v in &overlay_frame.vars {
if options.match_algorithm.matches_u8_insensitive(
options.case_sensitive,
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 338d924a69..02609924a1 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -389,7 +389,7 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
.with_completer(Box::new(NuCompleter::new(
engine_reference.clone(),
// STACK-REFERENCE 2
- Stack::with_parent(stack_arc.clone()),
+ stack_arc.clone(),
)))
.with_quick_completions(config.quick_completions)
.with_partial_completions(config.partial_completions)
diff --git a/crates/nu-cli/tests/completions.rs b/crates/nu-cli/tests/completions.rs
index a22d770010..cb883b67db 100644
--- a/crates/nu-cli/tests/completions.rs
+++ b/crates/nu-cli/tests/completions.rs
@@ -6,7 +6,10 @@ use nu_parser::parse;
use nu_protocol::{debugger::WithoutDebug, engine::StateWorkingSet, PipelineData};
use reedline::{Completer, Suggestion};
use rstest::{fixture, rstest};
-use std::path::{PathBuf, MAIN_SEPARATOR};
+use std::{
+ path::{PathBuf, MAIN_SEPARATOR},
+ sync::Arc,
+};
use support::{
completions_helpers::{new_partial_engine, new_quote_engine},
file, folder, match_suggestions, new_engine,
@@ -22,7 +25,7 @@ fn completer() -> NuCompleter {
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
// Instantiate a new completer
- NuCompleter::new(std::sync::Arc::new(engine), stack)
+ NuCompleter::new(Arc::new(engine), Arc::new(stack))
}
#[fixture]
@@ -36,7 +39,7 @@ fn completer_strings() -> NuCompleter {
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
// Instantiate a new completer
- NuCompleter::new(std::sync::Arc::new(engine), stack)
+ NuCompleter::new(Arc::new(engine), Arc::new(stack))
}
#[fixture]
@@ -56,7 +59,7 @@ fn extern_completer() -> NuCompleter {
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
// Instantiate a new completer
- NuCompleter::new(std::sync::Arc::new(engine), stack)
+ NuCompleter::new(Arc::new(engine), Arc::new(stack))
}
#[fixture]
@@ -79,14 +82,14 @@ fn custom_completer() -> NuCompleter {
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
// Instantiate a new completer
- NuCompleter::new(std::sync::Arc::new(engine), stack)
+ NuCompleter::new(Arc::new(engine), Arc::new(stack))
}
#[test]
fn variables_dollar_sign_with_varialblecompletion() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "$ ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -138,7 +141,7 @@ fn dotnu_completions() {
let (_, _, engine, stack) = new_engine();
// Instantiate a new completer
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
// Test source completion
let completion_str = "source-env ".to_string();
@@ -217,7 +220,7 @@ fn file_completions() {
let (dir, dir_str, engine, stack) = new_engine();
// Instantiate a new completer
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
// Test completions for the current folder
let target_dir = format!("cp {dir_str}{MAIN_SEPARATOR}");
@@ -265,7 +268,7 @@ fn partial_completions() {
let (dir, _, engine, stack) = new_partial_engine();
// Instantiate a new completer
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
// Test completions for a folder's name
let target_dir = format!("cd {}", file(dir.join("pa")));
@@ -363,7 +366,7 @@ fn partial_completions() {
fn command_ls_with_filecompletion() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "ls ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -397,7 +400,7 @@ fn command_ls_with_filecompletion() {
fn command_open_with_filecompletion() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "open ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -432,7 +435,7 @@ fn command_open_with_filecompletion() {
fn command_rm_with_globcompletion() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "rm ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -467,7 +470,7 @@ fn command_rm_with_globcompletion() {
fn command_cp_with_globcompletion() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "cp ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -502,7 +505,7 @@ fn command_cp_with_globcompletion() {
fn command_save_with_filecompletion() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "save ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -537,7 +540,7 @@ fn command_save_with_filecompletion() {
fn command_touch_with_filecompletion() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "touch ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -572,7 +575,7 @@ fn command_touch_with_filecompletion() {
fn command_watch_with_filecompletion() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "watch ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -607,7 +610,7 @@ fn command_watch_with_filecompletion() {
fn file_completion_quoted() {
let (_, _, engine, stack) = new_quote_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "open ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -645,7 +648,7 @@ fn flag_completions() {
let (_, _, engine, stack) = new_engine();
// Instantiate a new completer
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
// Test completions for the 'ls' flags
let suggestions = completer.complete("ls -", 4);
@@ -680,7 +683,7 @@ fn folder_with_directorycompletions() {
let (dir, dir_str, engine, stack) = new_engine();
// Instantiate a new completer
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
// Test completions for the current folder
let target_dir = format!("cd {dir_str}{MAIN_SEPARATOR}");
@@ -709,7 +712,7 @@ fn variables_completions() {
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
// Instantiate a new completer
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
// Test completions for $nu
let suggestions = completer.complete("$nu.", 4);
@@ -815,7 +818,7 @@ fn alias_of_command_and_flags() {
let alias = r#"alias ll = ls -l"#;
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let suggestions = completer.complete("ll t", 4);
#[cfg(windows)]
@@ -834,7 +837,7 @@ fn alias_of_basic_command() {
let alias = r#"alias ll = ls "#;
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let suggestions = completer.complete("ll t", 4);
#[cfg(windows)]
@@ -856,7 +859,7 @@ fn alias_of_another_alias() {
let alias = r#"alias lf = ll -f"#;
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let suggestions = completer.complete("lf t", 4);
#[cfg(windows)]
@@ -890,7 +893,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec {
assert!(engine_state.merge_env(&mut stack, &dir).is_ok());
// Instantiate a new completer
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine_state), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine_state), Arc::new(stack));
completer.complete(input, input.len())
}
@@ -899,7 +902,7 @@ fn run_external_completion(completer: &str, input: &str) -> Vec {
fn unknown_command_completion() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let target_dir = "thiscommanddoesnotexist ";
let suggestions = completer.complete(target_dir, target_dir.len());
@@ -962,7 +965,7 @@ fn flagcompletion_triggers_after_cursor_piped(mut completer: NuCompleter) {
fn filecompletions_triggers_after_cursor() {
let (_, _, engine, stack) = new_engine();
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
let suggestions = completer.complete("cp test_c", 3);
@@ -1071,7 +1074,7 @@ fn alias_offset_bug_7648() {
let alias = r#"alias ea = ^$env.EDITOR /tmp/test.s"#;
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
// Issue #7648
// Nushell crashes when an alias name is shorter than the alias command
@@ -1090,7 +1093,7 @@ fn alias_offset_bug_7754() {
let alias = r#"alias ll = ls -l"#;
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
- let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
+ let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
// Issue #7754
// Nushell crashes when an alias name is shorter than the alias command
diff --git a/crates/nu-lsp/src/lib.rs b/crates/nu-lsp/src/lib.rs
index 939bb0e4e0..47535d9bd4 100644
--- a/crates/nu-lsp/src/lib.rs
+++ b/crates/nu-lsp/src/lib.rs
@@ -552,8 +552,8 @@ impl LanguageServer {
¶ms.text_document_position.text_document.uri,
)?;
- let stack = Stack::new();
- let mut completer = NuCompleter::new(Arc::new(engine_state.clone()), stack);
+ let mut completer =
+ NuCompleter::new(Arc::new(engine_state.clone()), Arc::new(Stack::new()));
let location =
Self::lsp_position_to_location(¶ms.text_document_position.position, rope_of_file);
diff --git a/src/ide.rs b/src/ide.rs
index 2b39dda946..73419ed857 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -606,8 +606,7 @@ pub fn hover(engine_state: &mut EngineState, file_path: &str, location: &Value)
}
pub fn complete(engine_reference: Arc, file_path: &str, location: &Value) {
- let stack = Stack::new();
- let mut completer = NuCompleter::new(engine_reference, stack);
+ let mut completer = NuCompleter::new(engine_reference, Arc::new(Stack::new()));
let file = std::fs::read(file_path)
.into_diagnostic()
From 1b2e680059c55c49ff17f081cabd1d0285bcf356 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Thu, 9 May 2024 23:09:44 +0000
Subject: [PATCH 11/42] Fix syntax highlighting for `not` (#12815)
# Description
Fixes #12813 where a panic occurs when syntax highlighting `not`. Also
fixes #12814 where syntax highlighting for `not` no longer works.
# User-Facing Changes
Bug fix.
---
crates/nu-cli/tests/commands/mod.rs | 1 +
crates/nu-cli/tests/commands/nu_highlight.rs | 7 +++++++
crates/nu-cli/tests/{completions.rs => completions/mod.rs} | 0
.../tests/{ => completions}/support/completions_helpers.rs | 0
crates/nu-cli/tests/{ => completions}/support/mod.rs | 0
crates/nu-cli/tests/main.rs | 2 ++
crates/nu-parser/src/flatten.rs | 4 ++--
7 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 crates/nu-cli/tests/commands/mod.rs
create mode 100644 crates/nu-cli/tests/commands/nu_highlight.rs
rename crates/nu-cli/tests/{completions.rs => completions/mod.rs} (100%)
rename crates/nu-cli/tests/{ => completions}/support/completions_helpers.rs (100%)
rename crates/nu-cli/tests/{ => completions}/support/mod.rs (100%)
create mode 100644 crates/nu-cli/tests/main.rs
diff --git a/crates/nu-cli/tests/commands/mod.rs b/crates/nu-cli/tests/commands/mod.rs
new file mode 100644
index 0000000000..00488f0b9e
--- /dev/null
+++ b/crates/nu-cli/tests/commands/mod.rs
@@ -0,0 +1 @@
+mod nu_highlight;
diff --git a/crates/nu-cli/tests/commands/nu_highlight.rs b/crates/nu-cli/tests/commands/nu_highlight.rs
new file mode 100644
index 0000000000..bd185a8634
--- /dev/null
+++ b/crates/nu-cli/tests/commands/nu_highlight.rs
@@ -0,0 +1,7 @@
+use nu_test_support::nu;
+
+#[test]
+fn nu_highlight_not_expr() {
+ let actual = nu!("'not false' | nu-highlight | ansi strip");
+ assert_eq!(actual.out, "not false");
+}
diff --git a/crates/nu-cli/tests/completions.rs b/crates/nu-cli/tests/completions/mod.rs
similarity index 100%
rename from crates/nu-cli/tests/completions.rs
rename to crates/nu-cli/tests/completions/mod.rs
diff --git a/crates/nu-cli/tests/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
similarity index 100%
rename from crates/nu-cli/tests/support/completions_helpers.rs
rename to crates/nu-cli/tests/completions/support/completions_helpers.rs
diff --git a/crates/nu-cli/tests/support/mod.rs b/crates/nu-cli/tests/completions/support/mod.rs
similarity index 100%
rename from crates/nu-cli/tests/support/mod.rs
rename to crates/nu-cli/tests/completions/support/mod.rs
diff --git a/crates/nu-cli/tests/main.rs b/crates/nu-cli/tests/main.rs
new file mode 100644
index 0000000000..a040a731f3
--- /dev/null
+++ b/crates/nu-cli/tests/main.rs
@@ -0,0 +1,2 @@
+mod commands;
+mod completions;
diff --git a/crates/nu-parser/src/flatten.rs b/crates/nu-parser/src/flatten.rs
index e70a48e9f1..92b424783a 100644
--- a/crates/nu-parser/src/flatten.rs
+++ b/crates/nu-parser/src/flatten.rs
@@ -180,12 +180,12 @@ fn flatten_expression_into(
flatten_expression_into(working_set, op, output);
flatten_expression_into(working_set, rhs, output);
}
- Expr::UnaryNot(expr) => {
+ Expr::UnaryNot(not) => {
output.push((
Span::new(expr.span.start, expr.span.start + 3),
FlatShape::Operator,
));
- flatten_expression_into(working_set, expr, output);
+ flatten_expression_into(working_set, not, output);
}
Expr::Closure(block_id) => {
let outer_span = expr.span;
From 72d3860d05e0cc62a22d9316f9028d01f309fa13 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Thu, 9 May 2024 23:29:27 +0000
Subject: [PATCH 12/42] Refactor the CLI code a bit (#12782)
# Description
Refactors the code in `nu-cli`, `main.rs`, `run.rs`, and few others.
Namely, I added `EngineState::generate_nu_constant` function to
eliminate some duplicate code. Otherwise, I changed a bunch of areas to
return errors instead of calling `std::process::exit`.
# User-Facing Changes
Should be none.
---
benches/benchmarks.rs | 8 +-
crates/nu-cli/src/config_files.rs | 23 +--
crates/nu-cli/src/eval_cmds.rs | 53 ++---
crates/nu-cli/src/eval_file.rs | 192 ++++--------------
crates/nu-cli/src/prompt_update.rs | 7 +-
crates/nu-cli/src/repl.rs | 8 +-
crates/nu-cli/src/util.rs | 21 +-
.../support/completions_helpers.rs | 7 +-
crates/nu-cmd-base/src/util.rs | 7 +-
crates/nu-engine/src/env.rs | 8 +-
crates/nu-lsp/src/diagnostics.rs | 9 +-
crates/nu-protocol/src/engine/engine_state.rs | 5 +-
crates/nu-protocol/src/errors/cli_error.rs | 1 -
crates/nu-protocol/src/eval_const.rs | 4 +-
src/command.rs | 1 -
src/config_files.rs | 14 +-
src/ide.rs | 19 +-
src/main.rs | 13 +-
src/run.rs | 51 +++--
19 files changed, 146 insertions(+), 305 deletions(-)
diff --git a/benches/benchmarks.rs b/benches/benchmarks.rs
index 9de7cc5758..84552daef9 100644
--- a/benches/benchmarks.rs
+++ b/benches/benchmarks.rs
@@ -4,8 +4,7 @@ use nu_plugin_protocol::{PluginCallResponse, PluginOutput};
use nu_protocol::{
engine::{EngineState, Stack},
- eval_const::create_nu_constant,
- PipelineData, Span, Spanned, Value, NU_VARIABLE_ID,
+ PipelineData, Span, Spanned, Value,
};
use nu_std::load_standard_library;
use nu_utils::{get_default_config, get_default_env};
@@ -30,9 +29,7 @@ fn setup_engine() -> EngineState {
// parsing config.nu breaks without PWD set, so set a valid path
engine_state.add_env_var("PWD".into(), Value::string(cwd, Span::test_data()));
- let nu_const = create_nu_constant(&engine_state, Span::unknown())
- .expect("Failed to create nushell constant.");
- engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
+ engine_state.generate_nu_constant();
engine_state
}
@@ -86,6 +83,7 @@ fn bench_command(
b.iter(move || {
let mut stack = stack.clone();
let mut engine = engine.clone();
+ #[allow(clippy::unit_arg)]
black_box(
evaluate_commands(
&commands,
diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index 091fe7daa3..e89fa6c1d1 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -1,12 +1,12 @@
use crate::util::eval_source;
#[cfg(feature = "plugin")]
use nu_path::canonicalize_with;
-use nu_protocol::{
- engine::{EngineState, Stack, StateWorkingSet},
- report_error, HistoryFileFormat, PipelineData,
-};
#[cfg(feature = "plugin")]
-use nu_protocol::{ParseError, PluginRegistryFile, Spanned};
+use nu_protocol::{engine::StateWorkingSet, report_error, ParseError, PluginRegistryFile, Spanned};
+use nu_protocol::{
+ engine::{EngineState, Stack},
+ report_error_new, HistoryFileFormat, PipelineData,
+};
#[cfg(feature = "plugin")]
use nu_utils::utils::perf;
use std::path::PathBuf;
@@ -25,10 +25,9 @@ pub fn read_plugin_file(
plugin_file: Option>,
storage_path: &str,
) {
+ use nu_protocol::ShellError;
use std::path::Path;
- use nu_protocol::{report_error_new, ShellError};
-
let span = plugin_file.as_ref().map(|s| s.span);
// Check and warn + abort if this is a .nu plugin file
@@ -239,13 +238,11 @@ pub fn eval_config_contents(
match engine_state.cwd(Some(stack)) {
Ok(cwd) => {
if let Err(e) = engine_state.merge_env(stack, cwd) {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
+ report_error_new(engine_state, &e);
}
}
Err(e) => {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
+ report_error_new(engine_state, &e);
}
}
}
@@ -266,8 +263,8 @@ pub(crate) fn get_history_path(storage_path: &str, mode: HistoryFileFormat) -> O
#[cfg(feature = "plugin")]
pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -> bool {
use nu_protocol::{
- report_error_new, PluginExample, PluginIdentity, PluginRegistryItem,
- PluginRegistryItemData, PluginSignature, ShellError,
+ PluginExample, PluginIdentity, PluginRegistryItem, PluginRegistryItemData, PluginSignature,
+ ShellError,
};
use std::collections::BTreeMap;
diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index 1e3cc70348..0b0b5f8ddf 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -5,8 +5,9 @@ use nu_parser::parse;
use nu_protocol::{
debugger::WithoutDebug,
engine::{EngineState, Stack, StateWorkingSet},
- report_error, PipelineData, Spanned, Value,
+ report_error, PipelineData, ShellError, Spanned, Value,
};
+use std::sync::Arc;
/// Run a command (or commands) given to us by the user
pub fn evaluate_commands(
@@ -16,13 +17,9 @@ pub fn evaluate_commands(
input: PipelineData,
table_mode: Option,
no_newline: bool,
-) -> Result> {
+) -> Result<(), ShellError> {
// Translate environment variables from Strings to Values
- if let Some(e) = convert_env_values(engine_state, stack) {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
- std::process::exit(1);
- }
+ convert_env_values(engine_state, stack)?;
// Parse the source code
let (block, delta) = {
@@ -41,7 +38,6 @@ pub fn evaluate_commands(
if let Some(err) = working_set.parse_errors.first() {
report_error(&working_set, err);
-
std::process::exit(1);
}
@@ -49,35 +45,26 @@ pub fn evaluate_commands(
};
// Update permanent state
- if let Err(err) = engine_state.merge_delta(delta) {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &err);
- }
+ engine_state.merge_delta(delta)?;
// Run the block
- let exit_code = match eval_block::(engine_state, stack, &block, input) {
- Ok(pipeline_data) => {
- let mut config = engine_state.get_config().clone();
- if let Some(t_mode) = table_mode {
- config.table_mode = t_mode.coerce_str()?.parse().unwrap_or_default();
- }
- crate::eval_file::print_table_or_error(
- engine_state,
- stack,
- pipeline_data,
- &mut config,
- no_newline,
- )
- }
- Err(err) => {
- let working_set = StateWorkingSet::new(engine_state);
+ let pipeline = eval_block::(engine_state, stack, &block, input)?;
- report_error(&working_set, &err);
- std::process::exit(1);
- }
- };
+ if let PipelineData::Value(Value::Error { error, .. }, ..) = pipeline {
+ return Err(*error);
+ }
+
+ if let Some(t_mode) = table_mode {
+ Arc::make_mut(&mut engine_state.config).table_mode =
+ t_mode.coerce_str()?.parse().unwrap_or_default();
+ }
+
+ let exit_code = pipeline.print(engine_state, stack, no_newline, false)?;
+ if exit_code != 0 {
+ std::process::exit(exit_code as i32);
+ }
info!("evaluate {}:{}:{}", file!(), line!(), column!());
- Ok(exit_code)
+ Ok(())
}
diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index 8107de71a5..7483c6bc33 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -1,15 +1,14 @@
use crate::util::eval_source;
use log::{info, trace};
-use miette::{IntoDiagnostic, Result};
use nu_engine::{convert_env_values, eval_block};
use nu_parser::parse;
use nu_path::canonicalize_with;
use nu_protocol::{
debugger::WithoutDebug,
engine::{EngineState, Stack, StateWorkingSet},
- report_error, Config, PipelineData, ShellError, Span, Value,
+ report_error, PipelineData, ShellError, Span, Value,
};
-use std::{io::Write, sync::Arc};
+use std::sync::Arc;
/// Entry point for evaluating a file.
///
@@ -21,73 +20,40 @@ pub fn evaluate_file(
engine_state: &mut EngineState,
stack: &mut Stack,
input: PipelineData,
-) -> Result<()> {
+) -> Result<(), ShellError> {
// Convert environment variables from Strings to Values and store them in the engine state.
- if let Some(e) = convert_env_values(engine_state, stack) {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
- std::process::exit(1);
- }
+ convert_env_values(engine_state, stack)?;
let cwd = engine_state.cwd_as_string(Some(stack))?;
- let file_path = canonicalize_with(&path, cwd).unwrap_or_else(|e| {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(
- &working_set,
- &ShellError::FileNotFoundCustom {
- msg: format!("Could not access file '{}': {:?}", path, e.to_string()),
- span: Span::unknown(),
- },
- );
- std::process::exit(1);
- });
+ let file_path =
+ canonicalize_with(&path, cwd).map_err(|err| ShellError::FileNotFoundCustom {
+ msg: format!("Could not access file '{path}': {err}"),
+ span: Span::unknown(),
+ })?;
- let file_path_str = file_path.to_str().unwrap_or_else(|| {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(
- &working_set,
- &ShellError::NonUtf8Custom {
- msg: format!(
- "Input file name '{}' is not valid UTF8",
- file_path.to_string_lossy()
- ),
- span: Span::unknown(),
- },
- );
- std::process::exit(1);
- });
+ let file_path_str = file_path
+ .to_str()
+ .ok_or_else(|| ShellError::NonUtf8Custom {
+ msg: format!(
+ "Input file name '{}' is not valid UTF8",
+ file_path.to_string_lossy()
+ ),
+ span: Span::unknown(),
+ })?;
- let file = std::fs::read(&file_path)
- .into_diagnostic()
- .unwrap_or_else(|e| {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(
- &working_set,
- &ShellError::FileNotFoundCustom {
- msg: format!(
- "Could not read file '{}': {:?}",
- file_path_str,
- e.to_string()
- ),
- span: Span::unknown(),
- },
- );
- std::process::exit(1);
- });
+ let file = std::fs::read(&file_path).map_err(|err| ShellError::FileNotFoundCustom {
+ msg: format!("Could not read file '{file_path_str}': {err}"),
+ span: Span::unknown(),
+ })?;
engine_state.file = Some(file_path.clone());
- let parent = file_path.parent().unwrap_or_else(|| {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(
- &working_set,
- &ShellError::FileNotFoundCustom {
- msg: format!("The file path '{file_path_str}' does not have a parent"),
- span: Span::unknown(),
- },
- );
- std::process::exit(1);
- });
+ let parent = file_path
+ .parent()
+ .ok_or_else(|| ShellError::FileNotFoundCustom {
+ msg: format!("The file path '{file_path_str}' does not have a parent"),
+ span: Span::unknown(),
+ })?;
stack.add_env_var(
"FILE_PWD".to_string(),
@@ -127,42 +93,25 @@ pub fn evaluate_file(
}
// Merge the changes into the engine state.
- engine_state
- .merge_delta(working_set.delta)
- .expect("merging delta into engine_state should succeed");
+ engine_state.merge_delta(working_set.delta)?;
// Check if the file contains a main command.
if engine_state.find_decl(b"main", &[]).is_some() {
// Evaluate the file, but don't run main yet.
- let pipeline_data =
- eval_block::(engine_state, stack, &block, PipelineData::empty());
- let pipeline_data = match pipeline_data {
- Err(ShellError::Return { .. }) => {
- // Allow early return before main is run.
- return Ok(());
- }
- x => x,
- }
- .unwrap_or_else(|e| {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
- std::process::exit(1);
- });
-
- // Print the pipeline output of the file.
- // The pipeline output of a file is the pipeline output of its last command.
- let result = pipeline_data.print(engine_state, stack, true, false);
- match result {
- Err(err) => {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &err);
- std::process::exit(1);
- }
- Ok(exit_code) => {
- if exit_code != 0 {
- std::process::exit(exit_code as i32);
+ let pipeline =
+ match eval_block::(engine_state, stack, &block, PipelineData::empty()) {
+ Ok(data) => data,
+ Err(ShellError::Return { .. }) => {
+ // Allow early return before main is run.
+ return Ok(());
}
- }
+ Err(err) => return Err(err),
+ };
+
+ // Print the pipeline output of the last command of the file.
+ let exit_code = pipeline.print(engine_state, stack, true, false)?;
+ if exit_code != 0 {
+ std::process::exit(exit_code as i32);
}
// Invoke the main command with arguments.
@@ -186,60 +135,3 @@ pub fn evaluate_file(
Ok(())
}
-
-pub(crate) fn print_table_or_error(
- engine_state: &mut EngineState,
- stack: &mut Stack,
- mut pipeline_data: PipelineData,
- config: &mut Config,
- no_newline: bool,
-) -> Option {
- let exit_code = match &mut pipeline_data {
- PipelineData::ExternalStream { exit_code, .. } => exit_code.take(),
- _ => None,
- };
-
- // Change the engine_state config to use the passed in configuration
- engine_state.set_config(config.clone());
-
- if let PipelineData::Value(Value::Error { error, .. }, ..) = &pipeline_data {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &**error);
- std::process::exit(1);
- }
-
- // We don't need to do anything special to print a table because print() handles it
- print_or_exit(pipeline_data, engine_state, stack, no_newline);
-
- // Make sure everything has finished
- if let Some(exit_code) = exit_code {
- let mut exit_code: Vec<_> = exit_code.into_iter().collect();
- exit_code
- .pop()
- .and_then(|last_exit_code| match last_exit_code {
- Value::Int { val: code, .. } => Some(code),
- _ => None,
- })
- } else {
- None
- }
-}
-
-fn print_or_exit(
- pipeline_data: PipelineData,
- engine_state: &EngineState,
- stack: &mut Stack,
- no_newline: bool,
-) {
- let result = pipeline_data.print(engine_state, stack, no_newline, false);
-
- let _ = std::io::stdout().flush();
- let _ = std::io::stderr().flush();
-
- if let Err(error) = result {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &error);
- let _ = std::io::stderr().flush();
- std::process::exit(1);
- }
-}
diff --git a/crates/nu-cli/src/prompt_update.rs b/crates/nu-cli/src/prompt_update.rs
index 827bff0e5a..0c24b8282a 100644
--- a/crates/nu-cli/src/prompt_update.rs
+++ b/crates/nu-cli/src/prompt_update.rs
@@ -2,8 +2,8 @@ use crate::NushellPrompt;
use log::trace;
use nu_engine::ClosureEvalOnce;
use nu_protocol::{
- engine::{EngineState, Stack, StateWorkingSet},
- report_error, Config, PipelineData, Value,
+ engine::{EngineState, Stack},
+ report_error_new, Config, PipelineData, Value,
};
use reedline::Prompt;
@@ -77,8 +77,7 @@ fn get_prompt_string(
result
.map_err(|err| {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &err);
+ report_error_new(engine_state, &err);
})
.ok()
}
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 02609924a1..3fe51db496 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -26,9 +26,8 @@ use nu_parser::{lex, parse, trim_quotes_str};
use nu_protocol::{
config::NuCursorShape,
engine::{EngineState, Stack, StateWorkingSet},
- eval_const::create_nu_constant,
report_error_new, HistoryConfig, HistoryFileFormat, PipelineData, ShellError, Span, Spanned,
- Value, NU_VARIABLE_ID,
+ Value,
};
use nu_utils::{
filesystem::{have_permission, PermissionResult},
@@ -87,7 +86,7 @@ pub fn evaluate_repl(
let start_time = std::time::Instant::now();
// Translate environment variables from Strings to Values
- if let Some(e) = convert_env_values(engine_state, &unique_stack) {
+ if let Err(e) = convert_env_values(engine_state, &unique_stack) {
report_error_new(engine_state, &e);
}
perf(
@@ -145,8 +144,7 @@ pub fn evaluate_repl(
engine_state.set_startup_time(entire_start_time.elapsed().as_nanos() as i64);
// Regenerate the $nu constant to contain the startup time and any other potential updates
- let nu_const = create_nu_constant(engine_state, Span::unknown())?;
- engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
+ engine_state.generate_nu_constant();
if load_std_lib.is_none() && engine_state.get_config().show_banner {
eval_source(
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 8ff4ef35ea..2f996691c9 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -39,9 +39,8 @@ fn gather_env_vars(
init_cwd: &Path,
) {
fn report_capture_error(engine_state: &EngineState, env_str: &str, msg: &str) {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(
- &working_set,
+ report_error_new(
+ engine_state,
&ShellError::GenericError {
error: format!("Environment variable was not captured: {env_str}"),
msg: "".into(),
@@ -71,9 +70,8 @@ fn gather_env_vars(
}
None => {
// Could not capture current working directory
- let working_set = StateWorkingSet::new(engine_state);
- report_error(
- &working_set,
+ report_error_new(
+ engine_state,
&ShellError::GenericError {
error: "Current directory is not a valid utf-8 path".into(),
msg: "".into(),
@@ -278,10 +276,7 @@ pub fn eval_source(
match result {
Err(err) => {
- let working_set = StateWorkingSet::new(engine_state);
-
- report_error(&working_set, &err);
-
+ report_error_new(engine_state, &err);
return false;
}
Ok(exit_code) => {
@@ -297,11 +292,7 @@ pub fn eval_source(
}
Err(err) => {
set_last_exit_code(stack, 1);
-
- let working_set = StateWorkingSet::new(engine_state);
-
- report_error(&working_set, &err);
-
+ report_error_new(engine_state, &err);
return false;
}
}
diff --git a/crates/nu-cli/tests/completions/support/completions_helpers.rs b/crates/nu-cli/tests/completions/support/completions_helpers.rs
index bdc52739ee..47f46ab00e 100644
--- a/crates/nu-cli/tests/completions/support/completions_helpers.rs
+++ b/crates/nu-cli/tests/completions/support/completions_helpers.rs
@@ -3,8 +3,7 @@ use nu_parser::parse;
use nu_protocol::{
debugger::WithoutDebug,
engine::{EngineState, Stack, StateWorkingSet},
- eval_const::create_nu_constant,
- PipelineData, ShellError, Span, Value, NU_VARIABLE_ID,
+ PipelineData, ShellError, Span, Value,
};
use nu_test_support::fs;
use reedline::Suggestion;
@@ -28,9 +27,7 @@ pub fn new_engine() -> (PathBuf, String, EngineState, Stack) {
let mut engine_state = create_default_context();
// Add $nu
- let nu_const =
- create_nu_constant(&engine_state, Span::test_data()).expect("Failed creating $nu");
- engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
+ engine_state.generate_nu_constant();
// New stack
let mut stack = Stack::new();
diff --git a/crates/nu-cmd-base/src/util.rs b/crates/nu-cmd-base/src/util.rs
index 619237a21c..4d19fdb3c6 100644
--- a/crates/nu-cmd-base/src/util.rs
+++ b/crates/nu-cmd-base/src/util.rs
@@ -1,6 +1,6 @@
use nu_protocol::{
- engine::{EngineState, Stack, StateWorkingSet},
- report_error, Range, ShellError, Span, Value,
+ engine::{EngineState, Stack},
+ report_error_new, Range, ShellError, Span, Value,
};
use std::{ops::Bound, path::PathBuf};
@@ -14,8 +14,7 @@ pub fn get_init_cwd() -> PathBuf {
pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf {
engine_state.cwd(Some(stack)).unwrap_or_else(|e| {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
+ report_error_new(engine_state, &e);
crate::util::get_init_cwd()
})
}
diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index ae226c4421..44692dd131 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -32,7 +32,7 @@ enum ConversionResult {
/// It returns Option instead of Result since we do want to translate all the values we can and
/// skip errors. This function is called in the main() so we want to keep running, we cannot just
/// exit.
-pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Option {
+pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Result<(), ShellError> {
let mut error = None;
let mut new_scope = HashMap::new();
@@ -85,7 +85,11 @@ pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Opti
});
}
- error
+ if let Some(err) = error {
+ Err(err)
+ } else {
+ Ok(())
+ }
}
/// Translate one environment variable from Value to String
diff --git a/crates/nu-lsp/src/diagnostics.rs b/crates/nu-lsp/src/diagnostics.rs
index a9bbab77a9..423fffbf6c 100644
--- a/crates/nu-lsp/src/diagnostics.rs
+++ b/crates/nu-lsp/src/diagnostics.rs
@@ -7,8 +7,7 @@ use miette::{IntoDiagnostic, Result};
use nu_parser::parse;
use nu_protocol::{
engine::{EngineState, StateWorkingSet},
- eval_const::create_nu_constant,
- Span, Value, NU_VARIABLE_ID,
+ Value,
};
impl LanguageServer {
@@ -19,11 +18,7 @@ impl LanguageServer {
) -> Result<()> {
let cwd = std::env::current_dir().expect("Could not get current working directory.");
engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
-
- let Ok(nu_const) = create_nu_constant(engine_state, Span::unknown()) else {
- return Ok(());
- };
- engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
+ engine_state.generate_nu_constant();
let mut working_set = StateWorkingSet::new(engine_state);
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 1593b3341a..4a0ff4c4ae 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -6,6 +6,7 @@ use crate::{
CachedFile, Command, CommandType, EnvVars, OverlayFrame, ScopeFrame, Stack, StateDelta,
Variable, Visibility, DEFAULT_OVERLAY_NAME,
},
+ eval_const::create_nu_constant,
BlockId, Category, Config, DeclId, Example, FileId, HistoryConfig, Module, ModuleId, OverlayId,
ShellError, Signature, Span, Type, Value, VarId, VirtualPathId,
};
@@ -753,8 +754,8 @@ impl EngineState {
var.const_val.as_ref()
}
- pub fn set_variable_const_val(&mut self, var_id: VarId, val: Value) {
- self.vars[var_id].const_val = Some(val);
+ pub fn generate_nu_constant(&mut self) {
+ self.vars[NU_VARIABLE_ID].const_val = Some(create_nu_constant(self, Span::unknown()));
}
pub fn get_decl(&self, decl_id: DeclId) -> &dyn Command {
diff --git a/crates/nu-protocol/src/errors/cli_error.rs b/crates/nu-protocol/src/errors/cli_error.rs
index 6be1ebce40..003564f933 100644
--- a/crates/nu-protocol/src/errors/cli_error.rs
+++ b/crates/nu-protocol/src/errors/cli_error.rs
@@ -41,7 +41,6 @@ pub fn report_error_new(
error: &(dyn miette::Diagnostic + Send + Sync + 'static),
) {
let working_set = StateWorkingSet::new(engine_state);
-
report_error(&working_set, error);
}
diff --git a/crates/nu-protocol/src/eval_const.rs b/crates/nu-protocol/src/eval_const.rs
index e45e3b7e4b..140a8303d9 100644
--- a/crates/nu-protocol/src/eval_const.rs
+++ b/crates/nu-protocol/src/eval_const.rs
@@ -12,7 +12,7 @@ use std::{
};
/// Create a Value for `$nu`.
-pub fn create_nu_constant(engine_state: &EngineState, span: Span) -> Result {
+pub(crate) fn create_nu_constant(engine_state: &EngineState, span: Span) -> Value {
fn canonicalize_path(engine_state: &EngineState, path: &Path) -> PathBuf {
#[allow(deprecated)]
let cwd = engine_state.current_work_dir();
@@ -200,7 +200,7 @@ pub fn create_nu_constant(engine_state: &EngineState, span: Span) -> Result {
if let Err(e) = engine_state.merge_env(stack, cwd) {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
+ report_error_new(engine_state, &e);
}
}
Err(e) => {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
+ report_error_new(engine_state, &e);
}
}
}
@@ -193,13 +191,11 @@ fn eval_default_config(
match engine_state.cwd(Some(stack)) {
Ok(cwd) => {
if let Err(e) = engine_state.merge_env(stack, cwd) {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
+ report_error_new(engine_state, &e);
}
}
Err(e) => {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(&working_set, &e);
+ report_error_new(engine_state, &e);
}
}
}
diff --git a/src/ide.rs b/src/ide.rs
index 73419ed857..a3474fe3b6 100644
--- a/src/ide.rs
+++ b/src/ide.rs
@@ -3,8 +3,7 @@ use nu_cli::NuCompleter;
use nu_parser::{flatten_block, parse, FlatShape};
use nu_protocol::{
engine::{EngineState, Stack, StateWorkingSet},
- eval_const::create_nu_constant,
- report_error, DeclId, ShellError, Span, Value, VarId, NU_VARIABLE_ID,
+ report_error_new, DeclId, ShellError, Span, Value, VarId,
};
use reedline::Completer;
use serde_json::{json, Value as JsonValue};
@@ -56,9 +55,8 @@ fn read_in_file<'a>(
let file = std::fs::read(file_path)
.into_diagnostic()
.unwrap_or_else(|e| {
- let working_set = StateWorkingSet::new(engine_state);
- report_error(
- &working_set,
+ report_error_new(
+ engine_state,
&ShellError::FileNotFoundCustom {
msg: format!("Could not read file '{}': {:?}", file_path, e.to_string()),
span: Span::unknown(),
@@ -77,16 +75,7 @@ fn read_in_file<'a>(
pub fn check(engine_state: &mut EngineState, file_path: &str, max_errors: &Value) {
let cwd = std::env::current_dir().expect("Could not get current working directory.");
engine_state.add_env_var("PWD".into(), Value::test_string(cwd.to_string_lossy()));
- let working_set = StateWorkingSet::new(engine_state);
-
- let nu_const = match create_nu_constant(engine_state, Span::unknown()) {
- Ok(nu_const) => nu_const,
- Err(err) => {
- report_error(&working_set, &err);
- std::process::exit(1);
- }
- };
- engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
+ engine_state.generate_nu_constant();
let mut working_set = StateWorkingSet::new(engine_state);
let file = std::fs::read(file_path);
diff --git a/src/main.rs b/src/main.rs
index b7e70f1ed4..714b932df8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -27,8 +27,8 @@ use nu_cmd_base::util::get_init_cwd;
use nu_lsp::LanguageServer;
use nu_path::canonicalize_with;
use nu_protocol::{
- engine::EngineState, eval_const::create_nu_constant, report_error_new, util::BufferedReader,
- PipelineData, RawStream, ShellError, Span, Value, NU_VARIABLE_ID,
+ engine::EngineState, report_error_new, util::BufferedReader, PipelineData, RawStream,
+ ShellError, Span, Value,
};
use nu_std::load_standard_library;
use nu_utils::utils::perf;
@@ -378,8 +378,7 @@ fn main() -> Result<()> {
start_time = std::time::Instant::now();
// Set up the $nu constant before evaluating config files (need to have $nu available in them)
- let nu_const = create_nu_constant(&engine_state, input.span().unwrap_or_else(Span::unknown))?;
- engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
+ engine_state.generate_nu_constant();
perf(
"create_nu_constant",
start_time,
@@ -462,7 +461,8 @@ fn main() -> Result<()> {
&commands,
input,
entire_start_time,
- )
+ );
+ Ok(())
} else if !script_name.is_empty() {
run_file(
&mut engine_state,
@@ -471,7 +471,8 @@ fn main() -> Result<()> {
script_name,
args_to_script,
input,
- )
+ );
+ Ok(())
} else {
run_repl(&mut engine_state, parsed_nu_cli_args, entire_start_time)
}
diff --git a/src/run.rs b/src/run.rs
index 81274df3de..2996bc76f8 100644
--- a/src/run.rs
+++ b/src/run.rs
@@ -8,19 +8,22 @@ use log::trace;
#[cfg(feature = "plugin")]
use nu_cli::read_plugin_file;
use nu_cli::{evaluate_commands, evaluate_file, evaluate_repl};
-use nu_protocol::{eval_const::create_nu_constant, PipelineData, Span, NU_VARIABLE_ID};
+use nu_protocol::{
+ engine::{EngineState, Stack},
+ report_error_new, PipelineData, Spanned,
+};
use nu_utils::utils::perf;
pub(crate) fn run_commands(
- engine_state: &mut nu_protocol::engine::EngineState,
+ engine_state: &mut EngineState,
parsed_nu_cli_args: command::NushellCliArgs,
use_color: bool,
- commands: &nu_protocol::Spanned,
+ commands: &Spanned,
input: PipelineData,
entire_start_time: std::time::Instant,
-) -> Result<(), miette::ErrReport> {
+) {
trace!("run_commands");
- let mut stack = nu_protocol::engine::Stack::new();
+ let mut stack = Stack::new();
let start_time = std::time::Instant::now();
// if the --no-config-file(-n) option is NOT passed, load the plugin file,
@@ -103,18 +106,20 @@ pub(crate) fn run_commands(
engine_state.set_startup_time(entire_start_time.elapsed().as_nanos() as i64);
// Regenerate the $nu constant to contain the startup time and any other potential updates
- let nu_const = create_nu_constant(engine_state, commands.span)?;
- engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
+ engine_state.generate_nu_constant();
let start_time = std::time::Instant::now();
- let ret_val = evaluate_commands(
+ if let Err(err) = evaluate_commands(
commands,
engine_state,
&mut stack,
input,
parsed_nu_cli_args.table_mode,
parsed_nu_cli_args.no_newline.is_some(),
- );
+ ) {
+ report_error_new(engine_state, &err);
+ std::process::exit(1);
+ }
perf(
"evaluate_commands",
start_time,
@@ -123,24 +128,18 @@ pub(crate) fn run_commands(
column!(),
use_color,
);
-
- match ret_val {
- Ok(Some(exit_code)) => std::process::exit(exit_code as i32),
- Ok(None) => Ok(()),
- Err(e) => Err(e),
- }
}
pub(crate) fn run_file(
- engine_state: &mut nu_protocol::engine::EngineState,
+ engine_state: &mut EngineState,
parsed_nu_cli_args: command::NushellCliArgs,
use_color: bool,
script_name: String,
args_to_script: Vec,
input: PipelineData,
-) -> Result<(), miette::ErrReport> {
+) {
trace!("run_file");
- let mut stack = nu_protocol::engine::Stack::new();
+ let mut stack = Stack::new();
// if the --no-config-file(-n) option is NOT passed, load the plugin file,
// load the default env file or custom (depending on parsed_nu_cli_args.env_file),
@@ -201,17 +200,19 @@ pub(crate) fn run_file(
}
// Regenerate the $nu constant to contain the startup time and any other potential updates
- let nu_const = create_nu_constant(engine_state, input.span().unwrap_or_else(Span::unknown))?;
- engine_state.set_variable_const_val(NU_VARIABLE_ID, nu_const);
+ engine_state.generate_nu_constant();
let start_time = std::time::Instant::now();
- let ret_val = evaluate_file(
+ if let Err(err) = evaluate_file(
script_name,
&args_to_script,
engine_state,
&mut stack,
input,
- );
+ ) {
+ report_error_new(engine_state, &err);
+ std::process::exit(1);
+ }
perf(
"evaluate_file",
start_time,
@@ -239,17 +240,15 @@ pub(crate) fn run_file(
column!(),
use_color,
);
-
- ret_val
}
pub(crate) fn run_repl(
- engine_state: &mut nu_protocol::engine::EngineState,
+ engine_state: &mut EngineState,
parsed_nu_cli_args: command::NushellCliArgs,
entire_start_time: std::time::Instant,
) -> Result<(), miette::ErrReport> {
trace!("run_repl");
- let mut stack = nu_protocol::engine::Stack::new();
+ let mut stack = Stack::new();
let start_time = std::time::Instant::now();
if parsed_nu_cli_args.no_config_file.is_none() {
From 70c01bbb2617f5cd0cdeaeb66c691179a224b8aa Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Thu, 9 May 2024 23:50:31 +0000
Subject: [PATCH 13/42] Fix raw strings as external argument (#12817)
# Description
As discovered by @YizhePKU in a
[comment](https://github.com/nushell/nushell/pull/9956#issuecomment-2103123797)
in #9956, raw strings are not parsed properly when they are used as an
argument to an external command. This PR fixes that.
# Tests + Formatting
Added a test.
---
crates/nu-parser/src/parser.rs | 2 ++
crates/nu-parser/tests/test_parser.rs | 24 ++++++++++++++++++++++-
tests/shell/pipeline/commands/external.rs | 7 +++++++
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 7dfccf7bad..3416e538df 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -228,6 +228,8 @@ fn parse_external_arg(working_set: &mut StateWorkingSet, span: Span) -> External
ExternalArgument::Regular(parse_dollar_expr(working_set, span))
} else if contents.starts_with(b"[") {
ExternalArgument::Regular(parse_list_expression(working_set, span, &SyntaxShape::Any))
+ } else if contents.starts_with(b"r#") {
+ ExternalArgument::Regular(parse_raw_string(working_set, span))
} else if contents.len() > 3
&& contents.starts_with(b"...")
&& (contents[3] == b'$' || contents[3] == b'[' || contents[3] == b'(')
diff --git a/crates/nu-parser/tests/test_parser.rs b/crates/nu-parser/tests/test_parser.rs
index e73f0f2e02..9b8ae94317 100644
--- a/crates/nu-parser/tests/test_parser.rs
+++ b/crates/nu-parser/tests/test_parser.rs
@@ -1,6 +1,6 @@
use nu_parser::*;
use nu_protocol::{
- ast::{Argument, Call, Expr, PathMember, Range},
+ ast::{Argument, Call, Expr, ExternalArgument, PathMember, Range},
engine::{Command, EngineState, Stack, StateWorkingSet},
ParseError, PipelineData, ShellError, Signature, Span, SyntaxShape,
};
@@ -926,6 +926,28 @@ mod string {
assert!(working_set.parse_errors.is_empty());
}
}
+
+ #[test]
+ fn parse_raw_string_as_external_argument() {
+ let engine_state = EngineState::new();
+ let mut working_set = StateWorkingSet::new(&engine_state);
+
+ let block = parse(&mut working_set, None, b"^echo r#'text'#", true);
+
+ assert!(working_set.parse_errors.is_empty());
+ assert_eq!(block.len(), 1);
+ let pipeline = &block.pipelines[0];
+ assert_eq!(pipeline.len(), 1);
+ let element = &pipeline.elements[0];
+ assert!(element.redirection.is_none());
+ if let Expr::ExternalCall(_, args) = &element.expr.expr {
+ if let [ExternalArgument::Regular(expr)] = args.as_ref() {
+ assert_eq!(expr.expr, Expr::RawString("text".into()));
+ return;
+ }
+ }
+ panic!("wrong expression: {:?}", element.expr.expr)
+ }
}
#[rstest]
diff --git a/tests/shell/pipeline/commands/external.rs b/tests/shell/pipeline/commands/external.rs
index 88d443e4fd..3cbed5a124 100644
--- a/tests/shell/pipeline/commands/external.rs
+++ b/tests/shell/pipeline/commands/external.rs
@@ -314,6 +314,7 @@ mod external_words {
use super::nu;
use nu_test_support::fs::Stub::FileWithContent;
use nu_test_support::{pipeline, playground::Playground};
+
#[test]
fn relaxed_external_words() {
let actual = nu!("
@@ -323,6 +324,12 @@ mod external_words {
assert_eq!(actual.out, "joturner@foo.bar.baz");
}
+ #[test]
+ fn raw_string_as_external_argument() {
+ let actual = nu!("nu --testbin cococo r#'asdf'#");
+ assert_eq!(actual.out, "asdf");
+ }
+
//FIXME: jt: limitation in testing - can't use single ticks currently
#[ignore]
#[test]
From b9a7faad5adb59e1a9fae444586caa27f9e4058a Mon Sep 17 00:00:00 2001
From: YizhePKU
Date: Sat, 11 May 2024 00:06:33 +0800
Subject: [PATCH 14/42] Implement PWD recovery (#12779)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This PR has two parts. The first part is the addition of the
`Stack::set_pwd()` API. It strips trailing slashes from paths for
convenience, but will reject otherwise bad paths, leaving PWD in a good
state. This should reduce the impact of faulty code incorrectly trying
to set PWD.
(https://github.com/nushell/nushell/pull/12760#issuecomment-2095393012)
The second part is implementing a PWD recovery mechanism. PWD can become
bad even when we did nothing wrong. For example, Unix allows you to
remove any directory when another process might still be using it, which
means PWD can just "disappear" under our nose. This PR makes it possible
to use `cd` to reset PWD into a good state. Here's a demonstration:
```sh
mkdir /tmp/foo
cd /tmp/foo
# delete "/tmp/foo" in a subshell, because Nushell is smart and refuse to delete PWD
nu -c 'cd /; rm -r /tmp/foo'
ls # Error: × $env.PWD points to a non-existent directory
# help: Use `cd` to reset $env.PWD into a good state
cd /
pwd # prints /
```
Also, auto-cd should be working again.
---
Cargo.lock | 1 +
crates/nu-cli/Cargo.toml | 1 +
crates/nu-cli/src/repl.rs | 140 +++++++++++++++++-
crates/nu-cmd-base/src/util.rs | 9 +-
crates/nu-command/src/filesystem/cd.rs | 27 ++--
crates/nu-command/tests/commands/cd.rs | 14 ++
crates/nu-engine/src/eval.rs | 2 +-
crates/nu-protocol/src/engine/engine_state.rs | 19 ++-
crates/nu-protocol/src/engine/stack.rs | 34 +++++
9 files changed, 214 insertions(+), 33 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 6dcf38f7cb..f55ed5ceb4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2852,6 +2852,7 @@ dependencies = [
"reedline",
"rstest",
"sysinfo",
+ "tempfile",
"unicode-segmentation",
"uuid",
"which",
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 3423450cf3..e631f7ccf6 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -15,6 +15,7 @@ nu-cmd-lang = { path = "../nu-cmd-lang", version = "0.93.1" }
nu-command = { path = "../nu-command", version = "0.93.1" }
nu-test-support = { path = "../nu-test-support", version = "0.93.1" }
rstest = { workspace = true, default-features = false }
+tempfile = { workspace = true }
[dependencies]
nu-cmd-base = { path = "../nu-cmd-base", version = "0.93.1" }
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 3fe51db496..2482a7920e 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -870,7 +870,7 @@ fn parse_operation(
let tokens = lex(s.as_bytes(), 0, &[], &[], false);
// Check if this is a single call to a directory, if so auto-cd
#[allow(deprecated)]
- let cwd = nu_engine::env::current_dir_str(engine_state, stack)?;
+ let cwd = nu_engine::env::current_dir_str(engine_state, stack).unwrap_or_default();
let mut orig = s.clone();
if orig.starts_with('`') {
orig = trim_quotes_str(&orig).to_string()
@@ -927,7 +927,10 @@ fn do_auto_cd(
//FIXME: this only changes the current scope, but instead this environment variable
//should probably be a block that loads the information from the state in the overlay
- stack.add_env_var("PWD".into(), Value::string(path.clone(), Span::unknown()));
+ if let Err(err) = stack.set_cwd(&path) {
+ report_error_new(engine_state, &err);
+ return;
+ };
let cwd = Value::string(cwd, span);
let shells = stack.get_env_var(engine_state, "NUSHELL_SHELLS");
@@ -1479,3 +1482,136 @@ fn are_session_ids_in_sync() {
engine_state.history_session_id
);
}
+
+#[cfg(test)]
+mod test_auto_cd {
+ use super::{do_auto_cd, parse_operation, ReplOperation};
+ use nu_protocol::engine::{EngineState, Stack};
+ use std::path::Path;
+ use tempfile::tempdir;
+
+ /// Create a symlink. Works on both Unix and Windows.
+ #[cfg(any(unix, windows))]
+ fn symlink(original: impl AsRef, link: impl AsRef) -> std::io::Result<()> {
+ #[cfg(unix)]
+ {
+ std::os::unix::fs::symlink(original, link)
+ }
+ #[cfg(windows)]
+ {
+ if original.as_ref().is_dir() {
+ std::os::windows::fs::symlink_dir(original, link)
+ } else {
+ std::os::windows::fs::symlink_file(original, link)
+ }
+ }
+ }
+
+ /// Run one test case on the auto-cd feature. PWD is initially set to
+ /// `before`, and after `input` is parsed and evaluated, PWD should be
+ /// changed to `after`.
+ #[track_caller]
+ fn check(before: impl AsRef, input: &str, after: impl AsRef) {
+ // Setup EngineState and Stack.
+ let mut engine_state = EngineState::new();
+ let mut stack = Stack::new();
+ stack.set_cwd(before).unwrap();
+
+ // Parse the input. It must be an auto-cd operation.
+ let op = parse_operation(input.to_string(), &engine_state, &stack).unwrap();
+ let ReplOperation::AutoCd { cwd, target, span } = op else {
+ panic!("'{}' was not parsed into an auto-cd operation", input)
+ };
+
+ // Perform the auto-cd operation.
+ do_auto_cd(target, cwd, &mut stack, &mut engine_state, span);
+ let updated_cwd = engine_state.cwd(Some(&stack)).unwrap();
+
+ // Check that `updated_cwd` and `after` point to the same place. They
+ // don't have to be byte-wise equal (on Windows, the 8.3 filename
+ // conversion messes things up),
+ let updated_cwd = std::fs::canonicalize(updated_cwd).unwrap();
+ let after = std::fs::canonicalize(after).unwrap();
+ assert_eq!(updated_cwd, after);
+ }
+
+ #[test]
+ fn auto_cd_root() {
+ let tempdir = tempdir().unwrap();
+ let root = if cfg!(windows) { r"C:\" } else { "/" };
+ check(&tempdir, root, root);
+ }
+
+ #[test]
+ fn auto_cd_tilde() {
+ let tempdir = tempdir().unwrap();
+ let home = nu_path::home_dir().unwrap();
+ check(&tempdir, "~", home);
+ }
+
+ #[test]
+ fn auto_cd_dot() {
+ let tempdir = tempdir().unwrap();
+ check(&tempdir, ".", &tempdir);
+ }
+
+ #[test]
+ fn auto_cd_double_dot() {
+ let tempdir = tempdir().unwrap();
+ let dir = tempdir.path().join("foo");
+ std::fs::create_dir_all(&dir).unwrap();
+ check(dir, "..", &tempdir);
+ }
+
+ #[test]
+ fn auto_cd_triple_dot() {
+ let tempdir = tempdir().unwrap();
+ let dir = tempdir.path().join("foo").join("bar");
+ std::fs::create_dir_all(&dir).unwrap();
+ check(dir, "...", &tempdir);
+ }
+
+ #[test]
+ fn auto_cd_relative() {
+ let tempdir = tempdir().unwrap();
+ let foo = tempdir.path().join("foo");
+ let bar = tempdir.path().join("bar");
+ std::fs::create_dir_all(&foo).unwrap();
+ std::fs::create_dir_all(&bar).unwrap();
+
+ let input = if cfg!(windows) { r"..\bar" } else { "../bar" };
+ check(foo, input, bar);
+ }
+
+ #[test]
+ fn auto_cd_trailing_slash() {
+ let tempdir = tempdir().unwrap();
+ let dir = tempdir.path().join("foo");
+ std::fs::create_dir_all(&dir).unwrap();
+
+ let input = if cfg!(windows) { r"foo\" } else { "foo/" };
+ check(&tempdir, input, dir);
+ }
+
+ #[test]
+ fn auto_cd_symlink() {
+ let tempdir = tempdir().unwrap();
+ let dir = tempdir.path().join("foo");
+ std::fs::create_dir_all(&dir).unwrap();
+ let link = tempdir.path().join("link");
+ symlink(&dir, &link).unwrap();
+
+ let input = if cfg!(windows) { r".\link" } else { "./link" };
+ check(&tempdir, input, link);
+ }
+
+ #[test]
+ #[should_panic(expected = "was not parsed into an auto-cd operation")]
+ fn auto_cd_nonexistent_directory() {
+ let tempdir = tempdir().unwrap();
+ let dir = tempdir.path().join("foo");
+
+ let input = if cfg!(windows) { r"foo\" } else { "foo/" };
+ check(&tempdir, input, dir);
+ }
+}
diff --git a/crates/nu-cmd-base/src/util.rs b/crates/nu-cmd-base/src/util.rs
index 4d19fdb3c6..9c63dec836 100644
--- a/crates/nu-cmd-base/src/util.rs
+++ b/crates/nu-cmd-base/src/util.rs
@@ -1,6 +1,6 @@
use nu_protocol::{
engine::{EngineState, Stack},
- report_error_new, Range, ShellError, Span, Value,
+ Range, ShellError, Span, Value,
};
use std::{ops::Bound, path::PathBuf};
@@ -13,10 +13,9 @@ pub fn get_init_cwd() -> PathBuf {
}
pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf {
- engine_state.cwd(Some(stack)).unwrap_or_else(|e| {
- report_error_new(engine_state, &e);
- crate::util::get_init_cwd()
- })
+ engine_state
+ .cwd(Some(stack))
+ .unwrap_or(crate::util::get_init_cwd())
}
type MakeRangeError = fn(&str, Span) -> ShellError;
diff --git a/crates/nu-command/src/filesystem/cd.rs b/crates/nu-command/src/filesystem/cd.rs
index f90e9bfd2a..57fe1c17e3 100644
--- a/crates/nu-command/src/filesystem/cd.rs
+++ b/crates/nu-command/src/filesystem/cd.rs
@@ -1,3 +1,4 @@
+use nu_cmd_base::util::get_init_cwd;
use nu_engine::command_prelude::*;
use nu_utils::filesystem::{have_permission, PermissionResult};
@@ -39,7 +40,10 @@ impl Command for Cd {
) -> Result {
let physical = call.has_flag(engine_state, stack, "physical")?;
let path_val: Option> = call.opt(engine_state, stack, 0)?;
- let cwd = engine_state.cwd(Some(stack))?;
+
+ // If getting PWD failed, default to the initial directory. This way, the
+ // user can use `cd` to recover PWD to a good state.
+ let cwd = engine_state.cwd(Some(stack)).unwrap_or(get_init_cwd());
let path_val = {
if let Some(path) = path_val {
@@ -52,13 +56,13 @@ impl Command for Cd {
}
};
- let (path, span) = match path_val {
+ let path = match path_val {
Some(v) => {
if v.item == "-" {
if let Some(oldpwd) = stack.get_env_var(engine_state, "OLDPWD") {
- (oldpwd.to_path()?, v.span)
+ oldpwd.to_path()?
} else {
- (cwd, v.span)
+ cwd
}
} else {
// Trim whitespace from the end of path.
@@ -66,7 +70,7 @@ impl Command for Cd {
&v.item.trim_end_matches(|x| matches!(x, '\x09'..='\x0d'));
// If `--physical` is specified, canonicalize the path; otherwise expand the path.
- let path = if physical {
+ if physical {
if let Ok(path) = nu_path::canonicalize_with(path_no_whitespace, &cwd) {
if !path.is_dir() {
return Err(ShellError::NotADirectory { span: v.span });
@@ -90,19 +94,12 @@ impl Command for Cd {
return Err(ShellError::NotADirectory { span: v.span });
};
path
- };
- (path, v.span)
+ }
}
}
- None => {
- let path = nu_path::expand_tilde("~");
- (path, call.head)
- }
+ None => nu_path::expand_tilde("~"),
};
- // Strip the trailing slash from the new path. This is required for PWD.
- let path = nu_path::strip_trailing_slash(&path);
-
// Set OLDPWD.
// We're using `Stack::get_env_var()` instead of `EngineState::cwd()` to avoid a conversion roundtrip.
if let Some(oldpwd) = stack.get_env_var(engine_state, "PWD") {
@@ -113,7 +110,7 @@ impl Command for Cd {
//FIXME: this only changes the current scope, but instead this environment variable
//should probably be a block that loads the information from the state in the overlay
PermissionResult::PermissionOk => {
- stack.add_env_var("PWD".into(), Value::string(path.to_string_lossy(), span));
+ stack.set_cwd(path)?;
Ok(PipelineData::empty())
}
PermissionResult::PermissionDenied(reason) => Err(ShellError::IOError {
diff --git a/crates/nu-command/tests/commands/cd.rs b/crates/nu-command/tests/commands/cd.rs
index c7c30528e8..87af52aa4d 100644
--- a/crates/nu-command/tests/commands/cd.rs
+++ b/crates/nu-command/tests/commands/cd.rs
@@ -312,3 +312,17 @@ fn cd_permission_denied_folder() {
assert!(actual.err.contains("Folder is not able to read"));
});
}
+
+#[test]
+#[cfg(unix)]
+fn pwd_recovery() {
+ let nu = nu_test_support::fs::executable_path().display().to_string();
+ let tmpdir = std::env::temp_dir().join("foobar").display().to_string();
+
+ // We `cd` into a temporary directory, then spawn another `nu` process to
+ // delete that directory. Then we attempt to recover by running `cd /`.
+ let cmd = format!("mkdir {tmpdir}; cd {tmpdir}; {nu} -c 'cd /; rm -r {tmpdir}'; cd /; pwd");
+ let actual = nu!(cmd);
+
+ assert_eq!(actual.out, "/");
+}
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 6324b35ae7..8b4333dc55 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -654,7 +654,7 @@ impl Eval for EvalRuntime {
} else if quoted {
Ok(Value::string(path, span))
} else {
- let cwd = engine_state.cwd(Some(stack))?;
+ let cwd = engine_state.cwd(Some(stack)).unwrap_or_default();
let path = expand_path_with(path, cwd, true);
Ok(Value::string(path.to_string_lossy(), span))
diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs
index 4a0ff4c4ae..bea49b5d6c 100644
--- a/crates/nu-protocol/src/engine/engine_state.rs
+++ b/crates/nu-protocol/src/engine/engine_state.rs
@@ -931,13 +931,12 @@ impl EngineState {
/// directory on the stack that have yet to be merged into the engine state.
pub fn cwd(&self, stack: Option<&Stack>) -> Result {
// Helper function to create a simple generic error.
- // Its messages are not especially helpful, but these errors don't occur often, so it's probably fine.
- fn error(msg: &str) -> Result {
+ fn error(msg: &str, cwd: impl AsRef) -> Result {
Err(ShellError::GenericError {
error: msg.into(),
- msg: "".into(),
+ msg: format!("$env.PWD = {}", cwd.as_ref().display()),
span: None,
- help: None,
+ help: Some("Use `cd` to reset $env.PWD into a good state".into()),
inner: vec![],
})
}
@@ -967,21 +966,21 @@ impl EngineState {
// Technically, a root path counts as "having trailing slashes", but
// for the purpose of PWD, a root path is acceptable.
if !is_root(&path) && has_trailing_slash(&path) {
- error("$env.PWD contains trailing slashes")
+ error("$env.PWD contains trailing slashes", path)
} else if !path.is_absolute() {
- error("$env.PWD is not an absolute path")
+ error("$env.PWD is not an absolute path", path)
} else if !path.exists() {
- error("$env.PWD points to a non-existent directory")
+ error("$env.PWD points to a non-existent directory", path)
} else if !path.is_dir() {
- error("$env.PWD points to a non-directory")
+ error("$env.PWD points to a non-directory", path)
} else {
Ok(path)
}
} else {
- error("$env.PWD is not a string")
+ error("$env.PWD is not a string", format!("{pwd:?}"))
}
} else {
- error("$env.PWD not found")
+ error("$env.PWD not found", "")
}
}
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 2fa71f57fa..b577d55270 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -592,6 +592,40 @@ impl Stack {
self.out_dest.pipe_stderr = None;
self
}
+
+ /// Set the PWD environment variable to `path`.
+ ///
+ /// This method accepts `path` with trailing slashes, but they're removed
+ /// before writing the value into PWD.
+ pub fn set_cwd(&mut self, path: impl AsRef) -> Result<(), ShellError> {
+ // Helper function to create a simple generic error.
+ // Its messages are not especially helpful, but these errors don't occur often, so it's probably fine.
+ fn error(msg: &str) -> Result<(), ShellError> {
+ Err(ShellError::GenericError {
+ error: msg.into(),
+ msg: "".into(),
+ span: None,
+ help: None,
+ inner: vec![],
+ })
+ }
+
+ let path = path.as_ref();
+
+ if !path.is_absolute() {
+ error("Cannot set $env.PWD to a non-absolute path")
+ } else if !path.exists() {
+ error("Cannot set $env.PWD to a non-existent directory")
+ } else if !path.is_dir() {
+ error("Cannot set $env.PWD to a non-directory")
+ } else {
+ // Strip trailing slashes, if any.
+ let path = nu_path::strip_trailing_slash(path);
+ let value = Value::string(path.to_string_lossy(), Span::unknown());
+ self.add_env_var("PWD".into(), value);
+ Ok(())
+ }
+ }
}
#[cfg(test)]
From cab86f49c0fb48385dc9d3d5415e18b7b8a1d8d0 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Sat, 11 May 2024 15:32:00 +0000
Subject: [PATCH 15/42] Fix pipe redirection into `complete` (#12818)
# Description
Fixes #12796 where a combined out and err pipe redirection (`o+e>|`)
into `complete` still provides separate `stdout` and `stderr` columns in
the record. Now, the combined output will be in the `stdout` column.
This PR also fixes a similar error with the `e>|` pipe redirection.
# Tests + Formatting
Added two tests.
---
crates/nu-command/tests/commands/complete.rs | 13 +++++++++++++
crates/nu-engine/src/eval.rs | 17 ++++++++++++-----
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/crates/nu-command/tests/commands/complete.rs b/crates/nu-command/tests/commands/complete.rs
index cc398d4c8c..a5a8b6a256 100644
--- a/crates/nu-command/tests/commands/complete.rs
+++ b/crates/nu-command/tests/commands/complete.rs
@@ -92,3 +92,16 @@ fn capture_error_with_both_stdout_stderr_messages_not_hang_nushell() {
},
)
}
+
+#[test]
+fn combined_pipe_redirection() {
+ let actual = nu!("$env.FOO = hello; $env.BAR = world; nu --testbin echo_env_mixed out-err FOO BAR o+e>| complete | get stdout");
+ assert_eq!(actual.out, "helloworld");
+}
+
+#[test]
+fn err_pipe_redirection() {
+ let actual =
+ nu!("$env.FOO = hello; nu --testbin echo_env_stderr FOO e>| complete | get stdout");
+ assert_eq!(actual.out, "hello");
+}
diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs
index 8b4333dc55..b8d806b708 100644
--- a/crates/nu-engine/src/eval.rs
+++ b/crates/nu-engine/src/eval.rs
@@ -340,7 +340,13 @@ fn eval_redirection(
}
Ok(Redirection::file(options.create(true).open(path)?))
}
- RedirectionTarget::Pipe { .. } => Ok(Redirection::Pipe(next_out.unwrap_or(OutDest::Pipe))),
+ RedirectionTarget::Pipe { .. } => {
+ let dest = match next_out {
+ None | Some(OutDest::Capture) => OutDest::Pipe,
+ Some(next) => next,
+ };
+ Ok(Redirection::Pipe(dest))
+ }
}
}
@@ -367,11 +373,12 @@ fn eval_element_redirection(
} => {
let stderr = eval_redirection::(engine_state, stack, target, None)?;
if matches!(stderr, Redirection::Pipe(OutDest::Pipe)) {
+ let dest = match next_out {
+ None | Some(OutDest::Capture) => OutDest::Pipe,
+ Some(next) => next,
+ };
// e>| redirection, don't override current stack `stdout`
- Ok((
- None,
- Some(next_out.map(Redirection::Pipe).unwrap_or(stderr)),
- ))
+ Ok((None, Some(Redirection::Pipe(dest))))
} else {
Ok((next_out.map(Redirection::Pipe), Some(stderr)))
}
From 075535f86981d40dfa99836a800833606db66cbc Mon Sep 17 00:00:00 2001
From: Brage Ingebrigtsen <84551201+Skyppex@users.noreply.github.com>
Date: Sun, 12 May 2024 01:13:36 +0200
Subject: [PATCH 16/42] remove --not flag for 'str contains' (#12837)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
# Description
This PR resolves an inconsistency between different `str` subcommands,
notably `str contains`, `str starts-with` and `str ends-with`. Only the
`str contains` command has the `--not` flag and a desicion was made in
this #12781 PR to remove the `--not` flag and use the `not` operator
instead.
Before:
`"blob" | str contains --not o`
After:
`not ("blob" | str contains o)` OR `"blob" | str contains o | not $in`
> Note, you can currently do all three, but the first will be broken
after this PR is merged.
# User-Facing Changes
- remove `--not(-n)` flag from `str contains` command
- This is a breaking change!
# Tests + Formatting
- [x] Added tests
- [x] Ran `cargo fmt --all`
- [x] Ran `cargo clippy --workspace -- -D warnings -D
clippy::unwrap_used`
- [x] Ran `cargo test --workspace`
- [ ] Ran `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"`
- I was unable to get this working.
```
Error: nu::parser::export_not_found
× Export not found.
╭─[source:1:9]
1 │ use std testing; testing run-tests --path crates/nu-std
· ───┬───
· ╰── could not find imports
╰────
```
^ I still can't figure out how to make this work 😂
# After Submitting
Requires update of documentation
---
.../nu-command/src/strings/str_/contains.rs | 25 +++++++++++--------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/crates/nu-command/src/strings/str_/contains.rs b/crates/nu-command/src/strings/str_/contains.rs
index abb0ce1a2b..bc1d5bcf11 100644
--- a/crates/nu-command/src/strings/str_/contains.rs
+++ b/crates/nu-command/src/strings/str_/contains.rs
@@ -40,7 +40,7 @@ impl Command for SubCommand {
"For a data structure input, check strings at the given cell paths, and replace with result.",
)
.switch("ignore-case", "search is case insensitive", Some('i'))
- .switch("not", "does not contain", Some('n'))
+ .switch("not", "DEPRECATED OPTION: does not contain", Some('n'))
.category(Category::Strings)
}
@@ -59,6 +59,20 @@ impl Command for SubCommand {
call: &Call,
input: PipelineData,
) -> Result {
+ if call.has_flag(engine_state, stack, "not")? {
+ nu_protocol::report_error_new(
+ engine_state,
+ &ShellError::GenericError {
+ error: "Deprecated option".into(),
+ msg: "`str contains --not {string}` is deprecated and will be removed in 0.95."
+ .into(),
+ span: Some(call.head),
+ help: Some("Please use the `not` operator instead.".into()),
+ inner: vec![],
+ },
+ );
+ }
+
let cell_paths: Vec = call.rest(engine_state, stack, 1)?;
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
let args = Arguments {
@@ -120,15 +134,6 @@ impl Command for SubCommand {
Value::test_bool(false),
])),
},
- Example {
- description: "Check if list does not contain string",
- example: "[one two three] | str contains --not o",
- result: Some(Value::test_list(vec![
- Value::test_bool(false),
- Value::test_bool(false),
- Value::test_bool(true),
- ])),
- },
]
}
}
From 30fc83203508c1c2470a2f6ad188e90f7efbbcb8 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Sun, 12 May 2024 11:19:28 +0000
Subject: [PATCH 17/42] Fix custom converters with `save` (#12833)
# Description
Fixes #10429 where `save` fails if a custom command is used as the file
format converter.
# Tests + Formatting
Added a test.
---
crates/nu-command/src/filesystem/save.rs | 41 +++++++++++-------------
crates/nu-command/tests/commands/save.rs | 17 ++++++++++
2 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 3b92416ab5..0826284798 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -1,4 +1,5 @@
use crate::progress_bar;
+use nu_engine::get_eval_block;
#[allow(deprecated)]
use nu_engine::{command_prelude::*, current_dir};
use nu_path::expand_path_with;
@@ -311,12 +312,13 @@ fn input_to_bytes(
.map(|name| name.to_string_lossy().to_string())
};
- if let Some(ext) = ext {
- convert_to_extension(engine_state, &ext, stack, input, span)
+ let input = if let Some(ext) = ext {
+ convert_to_extension(engine_state, &ext, stack, input, span)?
} else {
- let value = input.into_value(span);
- value_to_bytes(value)
- }
+ input
+ };
+
+ value_to_bytes(input.into_value(span))
}
/// Convert given data into content of file of specified extension if
@@ -328,24 +330,19 @@ fn convert_to_extension(
stack: &mut Stack,
input: PipelineData,
span: Span,
-) -> Result, ShellError> {
- let converter = engine_state.find_decl(format!("to {extension}").as_bytes(), &[]);
-
- let output = match converter {
- Some(converter_id) => {
- let output = engine_state.get_decl(converter_id).run(
- engine_state,
- stack,
- &Call::new(span),
- input,
- )?;
-
- output.into_value(span)
+) -> Result {
+ if let Some(decl_id) = engine_state.find_decl(format!("to {extension}").as_bytes(), &[]) {
+ let decl = engine_state.get_decl(decl_id);
+ if let Some(block_id) = decl.get_block_id() {
+ let block = engine_state.get_block(block_id);
+ let eval_block = get_eval_block(engine_state);
+ eval_block(engine_state, stack, block, input)
+ } else {
+ decl.run(engine_state, stack, &Call::new(span), input)
}
- None => input.into_value(span),
- };
-
- value_to_bytes(output)
+ } else {
+ Ok(input)
+ }
}
/// Convert [`Value::String`] [`Value::Binary`] or [`Value::List`] into [`Vec`] of bytes
diff --git a/crates/nu-command/tests/commands/save.rs b/crates/nu-command/tests/commands/save.rs
index b5776a7bb9..ef0304dc7c 100644
--- a/crates/nu-command/tests/commands/save.rs
+++ b/crates/nu-command/tests/commands/save.rs
@@ -407,3 +407,20 @@ fn save_same_file_without_extension_pipeline() {
.contains("pipeline input and output are the same file"));
})
}
+
+#[test]
+fn save_with_custom_converter() {
+ Playground::setup("save_with_custom_converter", |dirs, _| {
+ let file = dirs.test().join("test.ndjson");
+
+ nu!(cwd: dirs.test(), pipeline(
+ r#"
+ def "to ndjson" []: any -> string { each { to json --raw } | to text } ;
+ {a: 1, b: 2} | save test.ndjson
+ "#
+ ));
+
+ let actual = file_contents(file);
+ assert_eq!(actual, r#"{"a":1,"b":2}"#);
+ })
+}
From c70c43aae94c674162ded5880fc549648b661e54 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Sun, 12 May 2024 21:55:07 -0400
Subject: [PATCH 18/42] Add example and search term for 'repeat' to the `fill`
command (#12844)
# Description
It's commonly forgotten or overlooked that a lot of `std repeat`
functionality can be handled with the built-in `fill`. Added 'repeat` as
a search term for `fill` to improve discoverability.
Also replaced one of the existing examples with one `fill`ing an empty
string, a la `repeat`. There were 6 examples already, and 3 of them
pretty much were variations on the same theme, so I repurposed one of
those rather than adding a 7th.
# User-Facing Changes
Changes to `help` only
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
I assume the "Commands" doc is auto-generated from the `help`, but I'll
double-check that assumption.
---
crates/nu-command/src/conversions/fill.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/crates/nu-command/src/conversions/fill.rs b/crates/nu-command/src/conversions/fill.rs
index 76ec1e81e5..6507e4a368 100644
--- a/crates/nu-command/src/conversions/fill.rs
+++ b/crates/nu-command/src/conversions/fill.rs
@@ -73,7 +73,7 @@ impl Command for Fill {
}
fn search_terms(&self) -> Vec<&str> {
- vec!["display", "render", "format", "pad", "align"]
+ vec!["display", "render", "format", "pad", "align", "repeat"]
}
fn examples(&self) -> Vec {
@@ -91,9 +91,9 @@ impl Command for Fill {
result: Some(Value::string("────────nushell", Span::test_data())),
},
Example {
- description: "Fill a string on both sides to a width of 15 with the character '─'",
- example: "'nushell' | fill --alignment m --character '─' --width 15",
- result: Some(Value::string("────nushell────", Span::test_data())),
+ description: "Fill an empty string with 10 '─' characters",
+ example: "'' | fill --character '─' --width 10",
+ result: Some(Value::string("──────────", Span::test_data())),
},
Example {
description:
From c4dca5fe03c0a33de0184564a62f37093b1c55d3 Mon Sep 17 00:00:00 2001
From: francesco-gaglione
<94604837+francesco-gaglione@users.noreply.github.com>
Date: Mon, 13 May 2024 15:37:53 +0200
Subject: [PATCH 19/42] Merged tests to produce a single binary (#12826)
This PR should close #7147
# Description
Merged src/tests into /tests to produce a single binary.
# User-Facing Changes
No user facing changes
# Tests + Formatting
Moved tests. Tollkit check pr pass.
# After Submitting
---------
Co-authored-by: Ian Manske
---
CONTRIBUTING.md | 1 -
src/main.rs | 2 --
tests/main.rs | 1 +
tests/repl/mod.rs | 27 +++++++++++++++++++
{src/tests => tests/repl}/test_bits.rs | 2 +-
{src/tests => tests/repl}/test_cell_path.rs | 2 +-
{src/tests => tests/repl}/test_commandline.rs | 2 +-
.../tests => tests/repl}/test_conditionals.rs | 2 +-
{src/tests => tests/repl}/test_config.rs | 3 +--
{src/tests => tests/repl}/test_config_path.rs | 0
{src/tests => tests/repl}/test_converters.rs | 2 +-
.../repl}/test_custom_commands.rs | 2 +-
{src/tests => tests/repl}/test_engine.rs | 2 +-
{src/tests => tests/repl}/test_env.rs | 2 +-
{src/tests => tests/repl}/test_help.rs | 2 +-
{src/tests => tests/repl}/test_hiding.rs | 2 +-
{src/tests => tests/repl}/test_ide.rs | 2 +-
{src/tests => tests/repl}/test_iteration.rs | 2 +-
.../repl}/test_known_external.rs | 3 +--
{src/tests => tests/repl}/test_math.rs | 2 +-
{src/tests => tests/repl}/test_modules.rs | 2 +-
{src/tests => tests/repl}/test_parser.rs | 4 +--
{src/tests => tests/repl}/test_ranges.rs | 2 +-
{src/tests => tests/repl}/test_regex.rs | 2 +-
{src/tests => tests/repl}/test_signatures.rs | 2 +-
{src/tests => tests/repl}/test_spread.rs | 2 +-
{src/tests => tests/repl}/test_stdlib.rs | 2 +-
{src/tests => tests/repl}/test_strings.rs | 2 +-
.../repl}/test_table_operations.rs | 2 +-
{src/tests => tests/repl}/test_type_check.rs | 2 +-
{src => tests/repl}/tests.rs | 27 -------------------
31 files changed, 53 insertions(+), 59 deletions(-)
create mode 100644 tests/repl/mod.rs
rename {src/tests => tests/repl}/test_bits.rs (97%)
rename {src/tests => tests/repl}/test_cell_path.rs (98%)
rename {src/tests => tests/repl}/test_commandline.rs (98%)
rename {src/tests => tests/repl}/test_conditionals.rs (96%)
rename {src/tests => tests/repl}/test_config.rs (98%)
rename {src/tests => tests/repl}/test_config_path.rs (100%)
rename {src/tests => tests/repl}/test_converters.rs (96%)
rename {src/tests => tests/repl}/test_custom_commands.rs (98%)
rename {src/tests => tests/repl}/test_engine.rs (99%)
rename {src/tests => tests/repl}/test_env.rs (91%)
rename {src/tests => tests/repl}/test_help.rs (94%)
rename {src/tests => tests/repl}/test_hiding.rs (99%)
rename {src/tests => tests/repl}/test_ide.rs (76%)
rename {src/tests => tests/repl}/test_iteration.rs (94%)
rename {src/tests => tests/repl}/test_known_external.rs (97%)
rename {src/tests => tests/repl}/test_math.rs (98%)
rename {src/tests => tests/repl}/test_modules.rs (98%)
rename {src/tests => tests/repl}/test_parser.rs (99%)
rename {src/tests => tests/repl}/test_ranges.rs (92%)
rename {src/tests => tests/repl}/test_regex.rs (96%)
rename {src/tests => tests/repl}/test_signatures.rs (99%)
rename {src/tests => tests/repl}/test_spread.rs (98%)
rename {src/tests => tests/repl}/test_stdlib.rs (86%)
rename {src/tests => tests/repl}/test_strings.rs (98%)
rename {src/tests => tests/repl}/test_table_operations.rs (99%)
rename {src/tests => tests/repl}/test_type_check.rs (98%)
rename {src => tests/repl}/tests.rs (89%)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1ecda698c7..d5cf758b56 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -55,7 +55,6 @@ It is good practice to cover your changes with a test. Also, try to think about
Tests can be found in different places:
* `/tests`
-* `src/tests`
* command examples
* crate-specific tests
diff --git a/src/main.rs b/src/main.rs
index 714b932df8..db0c80d4f2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,8 +7,6 @@ mod signals;
#[cfg(unix)]
mod terminal;
mod test_bins;
-#[cfg(test)]
-mod tests;
#[cfg(feature = "mimalloc")]
#[global_allocator]
diff --git a/tests/main.rs b/tests/main.rs
index db44c4e019..6824f26f13 100644
--- a/tests/main.rs
+++ b/tests/main.rs
@@ -11,5 +11,6 @@ mod path;
mod plugin_persistence;
#[cfg(feature = "plugin")]
mod plugins;
+mod repl;
mod scope;
mod shell;
diff --git a/tests/repl/mod.rs b/tests/repl/mod.rs
new file mode 100644
index 0000000000..5ed7f29ba5
--- /dev/null
+++ b/tests/repl/mod.rs
@@ -0,0 +1,27 @@
+mod test_bits;
+mod test_cell_path;
+mod test_commandline;
+mod test_conditionals;
+mod test_config;
+mod test_config_path;
+mod test_converters;
+mod test_custom_commands;
+mod test_engine;
+mod test_env;
+mod test_help;
+mod test_hiding;
+mod test_ide;
+mod test_iteration;
+mod test_known_external;
+mod test_math;
+mod test_modules;
+mod test_parser;
+mod test_ranges;
+mod test_regex;
+mod test_signatures;
+mod test_spread;
+mod test_stdlib;
+mod test_strings;
+mod test_table_operations;
+mod test_type_check;
+mod tests;
diff --git a/src/tests/test_bits.rs b/tests/repl/test_bits.rs
similarity index 97%
rename from src/tests/test_bits.rs
rename to tests/repl/test_bits.rs
index fdb672d023..410f48d83b 100644
--- a/src/tests/test_bits.rs
+++ b/tests/repl/test_bits.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
#[test]
fn bits_and() -> TestResult {
diff --git a/src/tests/test_cell_path.rs b/tests/repl/test_cell_path.rs
similarity index 98%
rename from src/tests/test_cell_path.rs
rename to tests/repl/test_cell_path.rs
index 56b6751638..c89c50259b 100644
--- a/src/tests/test_cell_path.rs
+++ b/tests/repl/test_cell_path.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
// Tests for null / null / Value::Nothing
#[test]
diff --git a/src/tests/test_commandline.rs b/tests/repl/test_commandline.rs
similarity index 98%
rename from src/tests/test_commandline.rs
rename to tests/repl/test_commandline.rs
index 130faf933a..0443ee4d6c 100644
--- a/src/tests/test_commandline.rs
+++ b/tests/repl/test_commandline.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
#[test]
fn commandline_test_get_empty() -> TestResult {
diff --git a/src/tests/test_conditionals.rs b/tests/repl/test_conditionals.rs
similarity index 96%
rename from src/tests/test_conditionals.rs
rename to tests/repl/test_conditionals.rs
index 20307ffe65..dd1e16c5a8 100644
--- a/src/tests/test_conditionals.rs
+++ b/tests/repl/test_conditionals.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
#[test]
fn if_test1() -> TestResult {
diff --git a/src/tests/test_config.rs b/tests/repl/test_config.rs
similarity index 98%
rename from src/tests/test_config.rs
rename to tests/repl/test_config.rs
index 96bd7f714d..005ae63171 100644
--- a/src/tests/test_config.rs
+++ b/tests/repl/test_config.rs
@@ -1,5 +1,4 @@
-use super::{fail_test, run_test, run_test_std};
-use crate::tests::TestResult;
+use crate::repl::tests::{fail_test, run_test, run_test_std, TestResult};
#[test]
fn mutate_nu_config() -> TestResult {
diff --git a/src/tests/test_config_path.rs b/tests/repl/test_config_path.rs
similarity index 100%
rename from src/tests/test_config_path.rs
rename to tests/repl/test_config_path.rs
diff --git a/src/tests/test_converters.rs b/tests/repl/test_converters.rs
similarity index 96%
rename from src/tests/test_converters.rs
rename to tests/repl/test_converters.rs
index c41868539e..cfa165e95d 100644
--- a/src/tests/test_converters.rs
+++ b/tests/repl/test_converters.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
#[test]
fn from_json_1() -> TestResult {
diff --git a/src/tests/test_custom_commands.rs b/tests/repl/test_custom_commands.rs
similarity index 98%
rename from src/tests/test_custom_commands.rs
rename to tests/repl/test_custom_commands.rs
index 4cc81878e4..43a24fa250 100644
--- a/src/tests/test_custom_commands.rs
+++ b/tests/repl/test_custom_commands.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, run_test_contains, TestResult};
+use crate::repl::tests::{fail_test, run_test, run_test_contains, TestResult};
use nu_test_support::nu;
use pretty_assertions::assert_eq;
diff --git a/src/tests/test_engine.rs b/tests/repl/test_engine.rs
similarity index 99%
rename from src/tests/test_engine.rs
rename to tests/repl/test_engine.rs
index 9f5be84763..c1eb919afa 100644
--- a/src/tests/test_engine.rs
+++ b/tests/repl/test_engine.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
use rstest::rstest;
#[test]
diff --git a/src/tests/test_env.rs b/tests/repl/test_env.rs
similarity index 91%
rename from src/tests/test_env.rs
rename to tests/repl/test_env.rs
index 159b3d0a20..7963f7580b 100644
--- a/src/tests/test_env.rs
+++ b/tests/repl/test_env.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
use nu_test_support::nu;
#[test]
diff --git a/src/tests/test_help.rs b/tests/repl/test_help.rs
similarity index 94%
rename from src/tests/test_help.rs
rename to tests/repl/test_help.rs
index b529f7cd19..16d168587a 100644
--- a/src/tests/test_help.rs
+++ b/tests/repl/test_help.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
use rstest::rstest;
#[rstest]
diff --git a/src/tests/test_hiding.rs b/tests/repl/test_hiding.rs
similarity index 99%
rename from src/tests/test_hiding.rs
rename to tests/repl/test_hiding.rs
index 81484cc51e..ee2016c54d 100644
--- a/src/tests/test_hiding.rs
+++ b/tests/repl/test_hiding.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
// TODO: Test the use/hide tests also as separate lines in REPL (i.e., with merging the delta in between)
#[test]
diff --git a/src/tests/test_ide.rs b/tests/repl/test_ide.rs
similarity index 76%
rename from src/tests/test_ide.rs
rename to tests/repl/test_ide.rs
index b5e40cfe8d..45cc87aa4d 100644
--- a/src/tests/test_ide.rs
+++ b/tests/repl/test_ide.rs
@@ -1,4 +1,4 @@
-use crate::tests::{test_ide_contains, TestResult};
+use crate::repl::tests::{test_ide_contains, TestResult};
#[test]
fn parser_recovers() -> TestResult {
diff --git a/src/tests/test_iteration.rs b/tests/repl/test_iteration.rs
similarity index 94%
rename from src/tests/test_iteration.rs
rename to tests/repl/test_iteration.rs
index da3eef9ce2..bcc21b9ef9 100644
--- a/src/tests/test_iteration.rs
+++ b/tests/repl/test_iteration.rs
@@ -1,4 +1,4 @@
-use crate::tests::{run_test, TestResult};
+use crate::repl::tests::{run_test, TestResult};
#[test]
fn better_block_types() -> TestResult {
diff --git a/src/tests/test_known_external.rs b/tests/repl/test_known_external.rs
similarity index 97%
rename from src/tests/test_known_external.rs
rename to tests/repl/test_known_external.rs
index 586ee40cd3..c140f4ee90 100644
--- a/src/tests/test_known_external.rs
+++ b/tests/repl/test_known_external.rs
@@ -1,7 +1,6 @@
+use crate::repl::tests::{fail_test, run_test, run_test_contains, TestResult};
use std::process::Command;
-use crate::tests::{fail_test, run_test, run_test_contains, TestResult};
-
// cargo version prints a string of the form:
// cargo 1.60.0 (d1fd9fe2c 2022-03-01)
diff --git a/src/tests/test_math.rs b/tests/repl/test_math.rs
similarity index 98%
rename from src/tests/test_math.rs
rename to tests/repl/test_math.rs
index ed372b198a..af44f8a857 100644
--- a/src/tests/test_math.rs
+++ b/tests/repl/test_math.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
#[test]
fn add_simple() -> TestResult {
diff --git a/src/tests/test_modules.rs b/tests/repl/test_modules.rs
similarity index 98%
rename from src/tests/test_modules.rs
rename to tests/repl/test_modules.rs
index 26ca62bf49..dd62c74b77 100644
--- a/src/tests/test_modules.rs
+++ b/tests/repl/test_modules.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
#[test]
fn module_def_imports_1() -> TestResult {
diff --git a/src/tests/test_parser.rs b/tests/repl/test_parser.rs
similarity index 99%
rename from src/tests/test_parser.rs
rename to tests/repl/test_parser.rs
index 3d19f05a9c..c0e7279b7b 100644
--- a/src/tests/test_parser.rs
+++ b/tests/repl/test_parser.rs
@@ -1,9 +1,7 @@
-use crate::tests::{fail_test, run_test, run_test_with_env, TestResult};
+use crate::repl::tests::{fail_test, run_test, run_test_contains, run_test_with_env, TestResult};
use nu_test_support::{nu, nu_repl_code};
use std::collections::HashMap;
-use super::run_test_contains;
-
#[test]
fn env_shorthand() -> TestResult {
run_test("FOO=BAR if false { 3 } else { 4 }", "4")
diff --git a/src/tests/test_ranges.rs b/tests/repl/test_ranges.rs
similarity index 92%
rename from src/tests/test_ranges.rs
rename to tests/repl/test_ranges.rs
index 3a007196e6..96f59eea84 100644
--- a/src/tests/test_ranges.rs
+++ b/tests/repl/test_ranges.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
#[test]
fn int_in_inc_range() -> TestResult {
diff --git a/src/tests/test_regex.rs b/tests/repl/test_regex.rs
similarity index 96%
rename from src/tests/test_regex.rs
rename to tests/repl/test_regex.rs
index adb59cc4a7..6f9063c81a 100644
--- a/src/tests/test_regex.rs
+++ b/tests/repl/test_regex.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
#[test]
fn contains() -> TestResult {
diff --git a/src/tests/test_signatures.rs b/tests/repl/test_signatures.rs
similarity index 99%
rename from src/tests/test_signatures.rs
rename to tests/repl/test_signatures.rs
index 1ca395c90f..5e265974d5 100644
--- a/src/tests/test_signatures.rs
+++ b/tests/repl/test_signatures.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
#[test]
fn list_annotations() -> TestResult {
diff --git a/src/tests/test_spread.rs b/tests/repl/test_spread.rs
similarity index 98%
rename from src/tests/test_spread.rs
rename to tests/repl/test_spread.rs
index 3dceea7089..419188be33 100644
--- a/src/tests/test_spread.rs
+++ b/tests/repl/test_spread.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
use nu_test_support::nu;
#[test]
diff --git a/src/tests/test_stdlib.rs b/tests/repl/test_stdlib.rs
similarity index 86%
rename from src/tests/test_stdlib.rs
rename to tests/repl/test_stdlib.rs
index 3be252ef77..401fd3c0aa 100644
--- a/src/tests/test_stdlib.rs
+++ b/tests/repl/test_stdlib.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test_std, TestResult};
+use crate::repl::tests::{fail_test, run_test_std, TestResult};
#[test]
fn library_loaded() -> TestResult {
diff --git a/src/tests/test_strings.rs b/tests/repl/test_strings.rs
similarity index 98%
rename from src/tests/test_strings.rs
rename to tests/repl/test_strings.rs
index 7d2ae1de84..cafd6cc681 100644
--- a/src/tests/test_strings.rs
+++ b/tests/repl/test_strings.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
#[test]
fn cjk_in_substrings() -> TestResult {
diff --git a/src/tests/test_table_operations.rs b/tests/repl/test_table_operations.rs
similarity index 99%
rename from src/tests/test_table_operations.rs
rename to tests/repl/test_table_operations.rs
index 9971261190..5d61e0d902 100644
--- a/src/tests/test_table_operations.rs
+++ b/tests/repl/test_table_operations.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
#[test]
fn illegal_column_duplication() -> TestResult {
diff --git a/src/tests/test_type_check.rs b/tests/repl/test_type_check.rs
similarity index 98%
rename from src/tests/test_type_check.rs
rename to tests/repl/test_type_check.rs
index ed912f8fff..87216e6672 100644
--- a/src/tests/test_type_check.rs
+++ b/tests/repl/test_type_check.rs
@@ -1,4 +1,4 @@
-use crate::tests::{fail_test, run_test, TestResult};
+use crate::repl::tests::{fail_test, run_test, TestResult};
#[test]
fn chained_operator_typecheck() -> TestResult {
diff --git a/src/tests.rs b/tests/repl/tests.rs
similarity index 89%
rename from src/tests.rs
rename to tests/repl/tests.rs
index 487173b9b1..e3a5e89471 100644
--- a/src/tests.rs
+++ b/tests/repl/tests.rs
@@ -1,30 +1,3 @@
-mod test_bits;
-mod test_cell_path;
-mod test_commandline;
-mod test_conditionals;
-mod test_config;
-mod test_config_path;
-mod test_converters;
-mod test_custom_commands;
-mod test_engine;
-mod test_env;
-mod test_help;
-mod test_hiding;
-mod test_ide;
-mod test_iteration;
-mod test_known_external;
-mod test_math;
-mod test_modules;
-mod test_parser;
-mod test_ranges;
-mod test_regex;
-mod test_signatures;
-mod test_spread;
-mod test_stdlib;
-mod test_strings;
-mod test_table_operations;
-mod test_type_check;
-
use assert_cmd::prelude::*;
use pretty_assertions::assert_eq;
use std::collections::HashMap;
From 905ec88091a118ba953548ae12fbdbdf4831fd93 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Mon, 13 May 2024 13:45:44 +0000
Subject: [PATCH 20/42] Update PR template (#12838)
# Description
Updates the command listed in the PR template to test the standard
library, following from #11151.
---
.github/pull_request_template.md | 2 +-
crates/nu-std/testing.nu | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 40cda47bbc..23d6a5ff95 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -26,7 +26,7 @@ Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
-- `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library
+- `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the tests for the standard library
> **Note**
> from `nushell` you can also use the `toolkit` as follows
diff --git a/crates/nu-std/testing.nu b/crates/nu-std/testing.nu
index ddae1d371e..489430e462 100644
--- a/crates/nu-std/testing.nu
+++ b/crates/nu-std/testing.nu
@@ -287,7 +287,7 @@ export def run-tests [
--list, # list the selected tests without running them.
--threads: int@"nu-complete threads", # Amount of threads to use for parallel execution. Default: All threads are utilized
] {
- let available_threads = (sys | get cpu | length)
+ let available_threads = (sys cpu | length)
# Can't use pattern matching here due to https://github.com/nushell/nushell/issues/9198
let threads = (if $threads == null {
From aaf973bbba9c1478be78fd192ae01dabc701a9ee Mon Sep 17 00:00:00 2001
From: Piepmatz
Date: Mon, 13 May 2024 20:48:38 +0200
Subject: [PATCH 21/42] Add Stack::stdout_file and Stack::stderr_file to
capture stdout/-err of external commands (#12857)
# Description
In this PR I added two new methods to `Stack`, `stdout_file` and
`stderr_file`. These two modify the inner `StackOutDest` and set a
`File` into the `stdout` and `stderr` respectively. Different to the
`push_redirection` methods, these do not require to hold a guard up all
the time but require ownership of the stack.
This is primarly useful for applications that use `nu` as a language but
not the `nushell`.
This PR replaces my first attempt #12851 to add a way to capture
stdout/-err of external commands. Capturing the stdout without having to
write into a file is possible with crates like
[`os_pipe`](https://docs.rs/os_pipe), an example for this is given in
the doc comment of the `stdout_file` command and can be executed as a
doctest (although it doesn't validate that you actually got any data).
This implementation takes `File` as input to make it easier to implement
on different operating systems without having to worry about
`OwnedHandle` or `OwnedFd`. Also this doesn't expose any use `os_pipe`
to not leak its types into this API, making it depend on it.
As in my previous attempt, @IanManske guided me here.
# User-Facing Changes
This change has no effect on `nushell` and therefore no user-facing
changes.
# Tests + Formatting
This only exposes a new way of using already existing code and has
therefore no further testing. The doctest succeeds on my machine at
least (x86 Windows, 64 Bit).
# After Submitting
All the required documentation is already part of this PR.
---
Cargo.lock | 1 +
Cargo.toml | 2 +-
crates/nu-protocol/Cargo.toml | 1 +
crates/nu-protocol/src/engine/stack.rs | 52 ++++++++++++++++++++++++++
4 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/Cargo.lock b/Cargo.lock
index f55ed5ceb4..4b1e1fadaf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3259,6 +3259,7 @@ dependencies = [
"nu-test-support",
"nu-utils",
"num-format",
+ "os_pipe",
"pretty_assertions",
"rmp-serde",
"rstest",
diff --git a/Cargo.toml b/Cargo.toml
index beabd26e20..78db3877ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -119,7 +119,7 @@ num-traits = "0.2"
omnipath = "0.1"
once_cell = "1.18"
open = "5.1"
-os_pipe = "1.1"
+os_pipe = { version = "1.1", features = ["io_safety"] }
pathdiff = "0.2"
percent-encoding = "2"
pretty_assertions = "1.4"
diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml
index e2420a6e83..be45738447 100644
--- a/crates/nu-protocol/Cargo.toml
+++ b/crates/nu-protocol/Cargo.toml
@@ -47,6 +47,7 @@ nu-test-support = { path = "../nu-test-support", version = "0.93.1" }
pretty_assertions = { workspace = true }
rstest = { workspace = true }
tempfile = { workspace = true }
+os_pipe = { workspace = true }
[package.metadata.docs.rs]
all-features = true
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index b577d55270..65f2981fbf 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -7,6 +7,7 @@ use crate::{
};
use std::{
collections::{HashMap, HashSet},
+ fs::File,
sync::Arc,
};
@@ -593,6 +594,57 @@ impl Stack {
self
}
+ /// Replaces the default stdout of the stack with a given file.
+ ///
+ /// This method configures the default stdout to redirect to a specified file.
+ /// It is primarily useful for applications using `nu` as a language, where the stdout of
+ /// external commands that are not explicitly piped can be redirected to a file.
+ ///
+ /// # Using Pipes
+ ///
+ /// For use in third-party applications pipes might be very useful as they allow using the
+ /// stdout of external commands for different uses.
+ /// For example the [`os_pipe`](https://docs.rs/os_pipe) crate provides a elegant way to to
+ /// access the stdout.
+ ///
+ /// ```
+ /// # use std::{fs::File, io::{self, Read}, thread, error};
+ /// # use nu_protocol::engine::Stack;
+ /// #
+ /// let (mut reader, writer) = os_pipe::pipe().unwrap();
+ /// // Use a thread to avoid blocking the execution of the called command.
+ /// let reader = thread::spawn(move || {
+ /// let mut buf: Vec = Vec::new();
+ /// reader.read_to_end(&mut buf)?;
+ /// Ok::<_, io::Error>(buf)
+ /// });
+ ///
+ /// #[cfg(windows)]
+ /// let file = std::os::windows::io::OwnedHandle::from(writer).into();
+ /// #[cfg(unix)]
+ /// let file = std::os::unix::io::OwnedFd::from(writer).into();
+ ///
+ /// let stack = Stack::new().stdout_file(file);
+ ///
+ /// // Execute some nu code.
+ ///
+ /// drop(stack); // drop the stack so that the writer will be dropped too
+ /// let buf = reader.join().unwrap().unwrap();
+ /// // Do with your buffer whatever you want.
+ /// ```
+ pub fn stdout_file(mut self, file: File) -> Self {
+ self.out_dest.stdout = OutDest::File(Arc::new(file));
+ self
+ }
+
+ /// Replaces the default stderr of the stack with a given file.
+ ///
+ /// For more info, see [`stdout_file`](Self::stdout_file).
+ pub fn stderr_file(mut self, file: File) -> Self {
+ self.out_dest.stderr = OutDest::File(Arc::new(file));
+ self
+ }
+
/// Set the PWD environment variable to `path`.
///
/// This method accepts `path` with trailing slashes, but they're removed
From 98369985b1252fe18cd50c0f87d38c09d7fb474a Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Mon, 13 May 2024 16:17:31 -0700
Subject: [PATCH 22/42] Allow custom value operations to work on eager and lazy
dataframes interchangeably. (#12819)
Fixes Bug #12809
The example that @maxim-uvarov posted now works as expected:
---
.../values/nu_dataframe/operations.rs | 2 +-
.../values/nu_lazyframe/custom_value.rs | 48 +++++++++++++++++--
2 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
index 42d803b0e4..db5409aff2 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_dataframe/operations.rs
@@ -27,7 +27,7 @@ impl NuDataFrame {
let rhs_span = right.span();
match right {
Value::Custom { .. } => {
- let rhs = NuDataFrame::try_from_value(plugin, right)?;
+ let rhs = NuDataFrame::try_from_value_coerce(plugin, right, rhs_span)?;
match (self.is_series(), rhs.is_series()) {
(true, true) => {
diff --git a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/custom_value.rs b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/custom_value.rs
index 731d210dd8..b3cd9500dd 100644
--- a/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/custom_value.rs
+++ b/crates/nu_plugin_polars/src/dataframe/values/nu_lazyframe/custom_value.rs
@@ -7,7 +7,7 @@ use uuid::Uuid;
use crate::{
values::{CustomValueSupport, NuDataFrame, PolarsPluginCustomValue},
- PolarsPlugin,
+ Cacheable, PolarsPlugin,
};
use super::NuLazyFrame;
@@ -76,11 +76,49 @@ impl PolarsPluginCustomValue for NuLazyFrameCustomValue {
_engine: &EngineInterface,
other_value: Value,
) -> Result, ShellError> {
- // to compare, we need to convert to NuDataframe
- let df = NuLazyFrame::try_from_custom_value(plugin, self)?;
- let df = df.collect(other_value.span())?;
+ let eager = NuLazyFrame::try_from_custom_value(plugin, self)?.collect(Span::unknown())?;
let other = NuDataFrame::try_from_value_coerce(plugin, &other_value, other_value.span())?;
- let res = df.is_equal(&other);
+ let res = eager.is_equal(&other);
Ok(res)
}
+
+ fn custom_value_operation(
+ &self,
+ plugin: &PolarsPlugin,
+ engine: &EngineInterface,
+ lhs_span: Span,
+ operator: nu_protocol::Spanned,
+ right: Value,
+ ) -> Result {
+ let eager = NuLazyFrame::try_from_custom_value(plugin, self)?.collect(Span::unknown())?;
+ Ok(eager
+ .compute_with_value(plugin, lhs_span, operator.item, operator.span, &right)?
+ .cache(plugin, engine, lhs_span)?
+ .into_value(lhs_span))
+ }
+
+ fn custom_value_follow_path_int(
+ &self,
+ plugin: &PolarsPlugin,
+ _engine: &EngineInterface,
+ _self_span: Span,
+ index: nu_protocol::Spanned,
+ ) -> Result {
+ let eager = NuLazyFrame::try_from_custom_value(plugin, self)?.collect(Span::unknown())?;
+ eager.get_value(index.item, index.span)
+ }
+
+ fn custom_value_follow_path_string(
+ &self,
+ plugin: &PolarsPlugin,
+ engine: &EngineInterface,
+ self_span: Span,
+ column_name: nu_protocol::Spanned,
+ ) -> Result {
+ let eager = NuLazyFrame::try_from_custom_value(plugin, self)?.collect(Span::unknown())?;
+ let column = eager.column(&column_name.item, self_span)?;
+ Ok(column
+ .cache(plugin, engine, self_span)?
+ .into_value(self_span))
+ }
}
From cd381b74e035a6b3d403e670e6d782cdea49309f Mon Sep 17 00:00:00 2001
From: Maxime Jacob
Date: Mon, 13 May 2024 21:22:39 -0400
Subject: [PATCH 23/42] Fix improperly escaped strings in stor insert (#12820)
- fixes #12764
Replaced the custom logic with values_to_sql method that is already used
in crate::database.
This will ensure that handling of parameters is the same between sqlite
and stor.
---
crates/nu-command/src/database/mod.rs | 2 +-
crates/nu-command/src/database/values/mod.rs | 2 +-
crates/nu-command/src/stor/insert.rs | 300 ++++++++++++++-----
3 files changed, 228 insertions(+), 76 deletions(-)
diff --git a/crates/nu-command/src/database/mod.rs b/crates/nu-command/src/database/mod.rs
index 4fddf6638e..22b92a81d3 100644
--- a/crates/nu-command/src/database/mod.rs
+++ b/crates/nu-command/src/database/mod.rs
@@ -5,7 +5,7 @@ use commands::add_commands_decls;
pub use values::{
convert_sqlite_row_to_nu_value, convert_sqlite_value_to_nu_value, open_connection_in_memory,
- open_connection_in_memory_custom, SQLiteDatabase, MEMORY_DB,
+ open_connection_in_memory_custom, values_to_sql, SQLiteDatabase, MEMORY_DB,
};
use nu_protocol::engine::StateWorkingSet;
diff --git a/crates/nu-command/src/database/values/mod.rs b/crates/nu-command/src/database/values/mod.rs
index 4442ec0783..b9bd3d5d4c 100644
--- a/crates/nu-command/src/database/values/mod.rs
+++ b/crates/nu-command/src/database/values/mod.rs
@@ -3,5 +3,5 @@ pub mod sqlite;
pub use sqlite::{
convert_sqlite_row_to_nu_value, convert_sqlite_value_to_nu_value, open_connection_in_memory,
- open_connection_in_memory_custom, SQLiteDatabase, MEMORY_DB,
+ open_connection_in_memory_custom, values_to_sql, SQLiteDatabase, MEMORY_DB,
};
diff --git a/crates/nu-command/src/stor/insert.rs b/crates/nu-command/src/stor/insert.rs
index 2aeb076d44..e0c0ad4d28 100644
--- a/crates/nu-command/src/stor/insert.rs
+++ b/crates/nu-command/src/stor/insert.rs
@@ -1,5 +1,6 @@
-use crate::database::{SQLiteDatabase, MEMORY_DB};
+use crate::database::{values_to_sql, SQLiteDatabase, MEMORY_DB};
use nu_engine::command_prelude::*;
+use rusqlite::params_from_iter;
#[derive(Clone)]
pub struct StorInsert;
@@ -57,86 +58,81 @@ impl Command for StorInsert {
// let config = engine_state.get_config();
let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
- if table_name.is_none() {
- return Err(ShellError::MissingParameter {
- param_name: "requires at table name".into(),
- span,
- });
- }
- let new_table_name = table_name.unwrap_or("table".into());
- if let Ok(conn) = db.open_connection() {
- match columns {
- Some(record) => {
- let mut create_stmt = format!("INSERT INTO {} ( ", new_table_name);
- let cols = record.columns();
- cols.for_each(|col| {
- create_stmt.push_str(&format!("{}, ", col));
- });
- if create_stmt.ends_with(", ") {
- create_stmt.pop();
- create_stmt.pop();
- }
+ process(table_name, span, &db, columns)?;
- create_stmt.push_str(") VALUES ( ");
- let vals = record.values();
- vals.for_each(|val| match val {
- Value::Int { val, .. } => {
- create_stmt.push_str(&format!("{}, ", val));
- }
- Value::Float { val, .. } => {
- create_stmt.push_str(&format!("{}, ", val));
- }
- Value::String { val, .. } => {
- create_stmt.push_str(&format!("'{}', ", val));
- }
- Value::Date { val, .. } => {
- create_stmt.push_str(&format!("'{}', ", val));
- }
- Value::Bool { val, .. } => {
- create_stmt.push_str(&format!("{}, ", val));
- }
- _ => {
- // return Err(ShellError::UnsupportedInput {
- // msg: format!("{} is not a valid datepart, expected one of year, month, day, hour, minute, second, millisecond, microsecond, nanosecond", part.item),
- // input: "value originates from here".to_string(),
- // msg_span: span,
- // input_span: val.span(),
- // });
- }
- });
- if create_stmt.ends_with(", ") {
- create_stmt.pop();
- create_stmt.pop();
- }
-
- create_stmt.push(')');
-
- // dbg!(&create_stmt);
-
- conn.execute(&create_stmt, [])
- .map_err(|err| ShellError::GenericError {
- error: "Failed to open SQLite connection in memory from insert".into(),
- msg: err.to_string(),
- span: Some(Span::test_data()),
- help: None,
- inner: vec![],
- })?;
- }
- None => {
- return Err(ShellError::MissingParameter {
- param_name: "requires at least one column".into(),
- span: call.head,
- });
- }
- };
- }
- // dbg!(db.clone());
Ok(Value::custom(db, span).into_pipeline_data())
}
}
+fn process(
+ table_name: Option,
+ span: Span,
+ db: &SQLiteDatabase,
+ columns: Option,
+) -> Result<(), ShellError> {
+ if table_name.is_none() {
+ return Err(ShellError::MissingParameter {
+ param_name: "requires at table name".into(),
+ span,
+ });
+ }
+ let new_table_name = table_name.unwrap_or("table".into());
+ if let Ok(conn) = db.open_connection() {
+ match columns {
+ Some(record) => {
+ let mut create_stmt = format!("INSERT INTO {} ( ", new_table_name);
+ let cols = record.columns();
+ cols.for_each(|col| {
+ create_stmt.push_str(&format!("{}, ", col));
+ });
+ if create_stmt.ends_with(", ") {
+ create_stmt.pop();
+ create_stmt.pop();
+ }
+
+ // Values are set as placeholders.
+ create_stmt.push_str(") VALUES ( ");
+ for (index, _) in record.columns().enumerate() {
+ create_stmt.push_str(&format!("?{}, ", index + 1));
+ }
+
+ if create_stmt.ends_with(", ") {
+ create_stmt.pop();
+ create_stmt.pop();
+ }
+
+ create_stmt.push(')');
+
+ // dbg!(&create_stmt);
+
+ // Get the params from the passed values
+ let params = values_to_sql(record.values().cloned())?;
+
+ conn.execute(&create_stmt, params_from_iter(params))
+ .map_err(|err| ShellError::GenericError {
+ error: "Failed to open SQLite connection in memory from insert".into(),
+ msg: err.to_string(),
+ span: Some(Span::test_data()),
+ help: None,
+ inner: vec![],
+ })?;
+ }
+ None => {
+ return Err(ShellError::MissingParameter {
+ param_name: "requires at least one column".into(),
+ span,
+ });
+ }
+ };
+ }
+ // dbg!(db.clone());
+ Ok(())
+}
+
#[cfg(test)]
mod test {
+ use chrono::DateTime;
+
use super::*;
#[test]
@@ -145,4 +141,160 @@ mod test {
test_examples(StorInsert {})
}
+
+ #[test]
+ fn test_process_with_simple_parameters() {
+ let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+ let create_stmt = "CREATE TABLE test_process_with_simple_parameters (
+ int_column INTEGER,
+ real_column REAL,
+ str_column VARCHAR(255),
+ bool_column BOOLEAN,
+ date_column DATETIME DEFAULT(STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW'))
+ )";
+
+ let conn = db
+ .open_connection()
+ .expect("Test was unable to open connection.");
+ conn.execute(create_stmt, [])
+ .expect("Failed to create table as part of test.");
+ let table_name = Some("test_process_with_simple_parameters".to_string());
+ let span = Span::unknown();
+ let mut columns = Record::new();
+ columns.insert("int_column".to_string(), Value::test_int(42));
+ columns.insert("real_column".to_string(), Value::test_float(3.1));
+ columns.insert(
+ "str_column".to_string(),
+ Value::test_string("SimpleString".to_string()),
+ );
+ columns.insert("bool_column".to_string(), Value::test_bool(true));
+ columns.insert(
+ "date_column".to_string(),
+ Value::test_date(
+ DateTime::parse_from_str("2021-12-30 00:00:00 +0000", "%Y-%m-%d %H:%M:%S %z")
+ .expect("Date string should parse."),
+ ),
+ );
+
+ let result = process(table_name, span, &db, Some(columns));
+
+ assert!(result.is_ok());
+ }
+
+ #[test]
+ fn test_process_string_with_space() {
+ let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+ let create_stmt = "CREATE TABLE test_process_string_with_space (
+ str_column VARCHAR(255)
+ )";
+
+ let conn = db
+ .open_connection()
+ .expect("Test was unable to open connection.");
+ conn.execute(create_stmt, [])
+ .expect("Failed to create table as part of test.");
+ let table_name = Some("test_process_string_with_space".to_string());
+ let span = Span::unknown();
+ let mut columns = Record::new();
+ columns.insert(
+ "str_column".to_string(),
+ Value::test_string("String With Spaces".to_string()),
+ );
+
+ let result = process(table_name, span, &db, Some(columns));
+
+ assert!(result.is_ok());
+ }
+
+ #[test]
+ fn test_no_errors_when_string_too_long() {
+ let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+ let create_stmt = "CREATE TABLE test_errors_when_string_too_long (
+ str_column VARCHAR(8)
+ )";
+
+ let conn = db
+ .open_connection()
+ .expect("Test was unable to open connection.");
+ conn.execute(create_stmt, [])
+ .expect("Failed to create table as part of test.");
+ let table_name = Some("test_errors_when_string_too_long".to_string());
+ let span = Span::unknown();
+ let mut columns = Record::new();
+ columns.insert(
+ "str_column".to_string(),
+ Value::test_string("ThisIsALongString".to_string()),
+ );
+
+ let result = process(table_name, span, &db, Some(columns));
+ // SQLite uses dynamic typing, making any length acceptable for a varchar column
+ assert!(result.is_ok());
+ }
+
+ #[test]
+ fn test_no_errors_when_param_is_wrong_type() {
+ let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+ let create_stmt = "CREATE TABLE test_errors_when_param_is_wrong_type (
+ int_column INT
+ )";
+
+ let conn = db
+ .open_connection()
+ .expect("Test was unable to open connection.");
+ conn.execute(create_stmt, [])
+ .expect("Failed to create table as part of test.");
+ let table_name = Some("test_errors_when_param_is_wrong_type".to_string());
+ let span = Span::unknown();
+ let mut columns = Record::new();
+ columns.insert(
+ "int_column".to_string(),
+ Value::test_string("ThisIsTheWrongType".to_string()),
+ );
+
+ let result = process(table_name, span, &db, Some(columns));
+ // SQLite uses dynamic typing, making any type acceptable for a column
+ assert!(result.is_ok());
+ }
+
+ #[test]
+ fn test_errors_when_column_doesnt_exist() {
+ let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+ let create_stmt = "CREATE TABLE test_errors_when_column_doesnt_exist (
+ int_column INT
+ )";
+
+ let conn = db
+ .open_connection()
+ .expect("Test was unable to open connection.");
+ conn.execute(create_stmt, [])
+ .expect("Failed to create table as part of test.");
+ let table_name = Some("test_errors_when_column_doesnt_exist".to_string());
+ let span = Span::unknown();
+ let mut columns = Record::new();
+ columns.insert(
+ "not_a_column".to_string(),
+ Value::test_string("ThisIsALongString".to_string()),
+ );
+
+ let result = process(table_name, span, &db, Some(columns));
+
+ assert!(result.is_err());
+ }
+
+ #[test]
+ fn test_errors_when_table_doesnt_exist() {
+ let db = Box::new(SQLiteDatabase::new(std::path::Path::new(MEMORY_DB), None));
+
+ let table_name = Some("test_errors_when_table_doesnt_exist".to_string());
+ let span = Span::unknown();
+ let mut columns = Record::new();
+ columns.insert(
+ "str_column".to_string(),
+ Value::test_string("ThisIsALongString".to_string()),
+ );
+
+ let result = process(table_name, span, &db, Some(columns));
+
+ assert!(result.is_err());
+ }
}
From 2ed77aef1dc9241c169c9e441aeb53f5a01932a0 Mon Sep 17 00:00:00 2001
From: Maxime Jacob
Date: Tue, 14 May 2024 10:13:49 -0400
Subject: [PATCH 24/42] Fix panic when exploring empty dictionary (#12860)
- fixes #12841
# Description
Add boundary checks to ensure that the row and column chosen in
RecordView are not over the length of the possible row and columns. If
we are out of bounds, we default to Value::nothing.
# Tests + Formatting
Tests ran and formatting done
---
crates/nu-explore/src/views/record/mod.rs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs
index 6534ba3589..0ed8e3e761 100644
--- a/crates/nu-explore/src/views/record/mod.rs
+++ b/crates/nu-explore/src/views/record/mod.rs
@@ -20,7 +20,7 @@ use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
use nu_color_config::{get_color_map, StyleComputer};
use nu_protocol::{
engine::{EngineState, Stack},
- Record, Value,
+ Record, Span, Value,
};
use ratatui::{layout::Rect, widgets::Block};
use std::{borrow::Cow, collections::HashMap};
@@ -180,7 +180,11 @@ impl<'a> RecordView<'a> {
Orientation::Left => (column, row),
};
- layer.records[row][column].clone()
+ if layer.records.len() > row && layer.records[row].len() > column {
+ layer.records[row][column].clone()
+ } else {
+ Value::nothing(Span::unknown())
+ }
}
fn create_tablew(&'a self, cfg: ViewConfig<'a>) -> TableW<'a> {
From aa46bc97b354d28c14c5ad2c51c9eb7f94276bec Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Tue, 14 May 2024 10:21:50 -0400
Subject: [PATCH 25/42] Search terms for compact command (#12864)
# Description
There was a question in Discord today about how to remove empty rows
from a table. The user found the `compact` command on their own, but I
realized that there were no search terms on the command. I've added
'empty' and 'remove', although I subsequently figured out that 'empty'
is found in the "usage" anyway. That said, I don't think it hurts to
have good search terms behind it regardless.
# User-Facing Changes
Just the help
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
---
crates/nu-command/src/filters/compact.rs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/crates/nu-command/src/filters/compact.rs b/crates/nu-command/src/filters/compact.rs
index d8872448be..9a4e968e9b 100644
--- a/crates/nu-command/src/filters/compact.rs
+++ b/crates/nu-command/src/filters/compact.rs
@@ -31,6 +31,10 @@ impl Command for Compact {
"Creates a table with non-empty rows."
}
+ fn search_terms(&self) -> Vec<&str> {
+ vec!["empty", "remove"]
+ }
+
fn run(
&self,
engine_state: &EngineState,
From c3da44cbb727348411d3520bf2b186860496f8da Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Tue, 14 May 2024 21:10:06 +0000
Subject: [PATCH 26/42] Fix `char` panic (#12867)
# Description
The `char` command can panic due to a failed `expect`: `char --integer
...[77 78 79]`
This PR fixes the panic for the `--integer` flag and also the
`--unicode` flag.
# After Submitting
Check other commands and places where similar bugs can occur due to
usages of `Call::positional_nth` and related methods.
---
crates/nu-command/src/strings/char_.rs | 90 ++++++++++++--------------
1 file changed, 41 insertions(+), 49 deletions(-)
diff --git a/crates/nu-command/src/strings/char_.rs b/crates/nu-command/src/strings/char_.rs
index e227f2667f..7d8d152b56 100644
--- a/crates/nu-command/src/strings/char_.rs
+++ b/crates/nu-command/src/strings/char_.rs
@@ -235,18 +235,18 @@ impl Command for Char {
// handle -i flag
if integer {
- let int_args: Vec = call.rest_const(working_set, 0)?;
- handle_integer_flag(int_args, call, call_span)
+ let int_args = call.rest_const(working_set, 0)?;
+ handle_integer_flag(int_args, call_span)
}
// handle -u flag
else if unicode {
- let string_args: Vec = call.rest_const(working_set, 0)?;
- handle_unicode_flag(string_args, call, call_span)
+ let string_args = call.rest_const(working_set, 0)?;
+ handle_unicode_flag(string_args, call_span)
}
// handle the rest
else {
- let string_args: Vec = call.rest_const(working_set, 0)?;
- handle_the_rest(string_args, call, call_span)
+ let string_args = call.rest_const(working_set, 0)?;
+ handle_the_rest(string_args, call_span)
}
}
@@ -270,18 +270,18 @@ impl Command for Char {
// handle -i flag
if integer {
- let int_args: Vec = call.rest(engine_state, stack, 0)?;
- handle_integer_flag(int_args, call, call_span)
+ let int_args = call.rest(engine_state, stack, 0)?;
+ handle_integer_flag(int_args, call_span)
}
// handle -u flag
else if unicode {
- let string_args: Vec = call.rest(engine_state, stack, 0)?;
- handle_unicode_flag(string_args, call, call_span)
+ let string_args = call.rest(engine_state, stack, 0)?;
+ handle_unicode_flag(string_args, call_span)
}
// handle the rest
else {
- let string_args: Vec = call.rest(engine_state, stack, 0)?;
- handle_the_rest(string_args, call, call_span)
+ let string_args = call.rest(engine_state, stack, 0)?;
+ handle_the_rest(string_args, call_span)
}
}
}
@@ -309,8 +309,7 @@ fn generate_character_list(ctrlc: Option>, call_span: Span) -> P
}
fn handle_integer_flag(
- int_args: Vec,
- call: &Call,
+ int_args: Vec>,
call_span: Span,
) -> Result {
if int_args.is_empty() {
@@ -319,20 +318,17 @@ fn handle_integer_flag(
span: call_span,
});
}
- let mut multi_byte = String::new();
- for (i, &arg) in int_args.iter().enumerate() {
- let span = call
- .positional_nth(i)
- .expect("Unexpected missing argument")
- .span;
- multi_byte.push(integer_to_unicode_char(arg, span)?)
- }
- Ok(Value::string(multi_byte, call_span).into_pipeline_data())
+
+ let str = int_args
+ .into_iter()
+ .map(integer_to_unicode_char)
+ .collect::>()?;
+
+ Ok(Value::string(str, call_span).into_pipeline_data())
}
fn handle_unicode_flag(
- string_args: Vec,
- call: &Call,
+ string_args: Vec>,
call_span: Span,
) -> Result {
if string_args.is_empty() {
@@ -341,57 +337,53 @@ fn handle_unicode_flag(
span: call_span,
});
}
- let mut multi_byte = String::new();
- for (i, arg) in string_args.iter().enumerate() {
- let span = call
- .positional_nth(i)
- .expect("Unexpected missing argument")
- .span;
- multi_byte.push(string_to_unicode_char(arg, span)?)
- }
- Ok(Value::string(multi_byte, call_span).into_pipeline_data())
+
+ let str = string_args
+ .into_iter()
+ .map(string_to_unicode_char)
+ .collect::>()?;
+
+ Ok(Value::string(str, call_span).into_pipeline_data())
}
fn handle_the_rest(
- string_args: Vec,
- call: &Call,
+ string_args: Vec>,
call_span: Span,
) -> Result {
- if string_args.is_empty() {
+ let Some(s) = string_args.first() else {
return Err(ShellError::MissingParameter {
param_name: "missing name of the character".into(),
span: call_span,
});
- }
- let special_character = str_to_character(&string_args[0]);
+ };
+
+ let special_character = str_to_character(&s.item);
+
if let Some(output) = special_character {
Ok(Value::string(output, call_span).into_pipeline_data())
} else {
Err(ShellError::TypeMismatch {
err_message: "error finding named character".into(),
- span: call
- .positional_nth(0)
- .expect("Unexpected missing argument")
- .span,
+ span: s.span,
})
}
}
-fn integer_to_unicode_char(value: i64, t: Span) -> Result {
- let decoded_char = value.try_into().ok().and_then(std::char::from_u32);
+fn integer_to_unicode_char(value: Spanned) -> Result {
+ let decoded_char = value.item.try_into().ok().and_then(std::char::from_u32);
if let Some(ch) = decoded_char {
Ok(ch)
} else {
Err(ShellError::TypeMismatch {
err_message: "not a valid Unicode codepoint".into(),
- span: t,
+ span: value.span,
})
}
}
-fn string_to_unicode_char(s: &str, t: Span) -> Result {
- let decoded_char = u32::from_str_radix(s, 16)
+fn string_to_unicode_char(s: Spanned) -> Result {
+ let decoded_char = u32::from_str_radix(&s.item, 16)
.ok()
.and_then(std::char::from_u32);
@@ -400,7 +392,7 @@ fn string_to_unicode_char(s: &str, t: Span) -> Result {
} else {
Err(ShellError::TypeMismatch {
err_message: "error decoding Unicode character".into(),
- span: t,
+ span: s.span,
})
}
}
From cb64c78a3b7a7b56a70a884096472531ccdf4c02 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 09:05:55 +0800
Subject: [PATCH 27/42] Bump interprocess from 2.0.1 to 2.1.0 (#12869)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Bumps [interprocess](https://github.com/kotauskas/interprocess) from
2.0.1 to 2.1.0.
Release notes
Sourced from interprocess's
releases.
2.1.0 – listeners are now iterators
- Fixes #49
- Adds
Iterator impl on local socket listeners (closes #64)
- Miscellaneous documentation fixes
Commits
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
Cargo.lock | 4 ++--
Cargo.toml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 4b1e1fadaf..e3d29fef42 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2034,9 +2034,9 @@ dependencies = [
[[package]]
name = "interprocess"
-version = "2.0.1"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c7fb8583fab9503654385e2bafda123376445a77027a1b106dd7e44cf51122f"
+checksum = "7b4d0250d41da118226e55b3d50ca3f0d9e0a0f6829b92f543ac0054aeea1572"
dependencies = [
"libc",
"recvmsg",
diff --git a/Cargo.toml b/Cargo.toml
index 78db3877ea..6b035ee0f8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -94,7 +94,7 @@ heck = "0.5.0"
human-date-parser = "0.1.1"
indexmap = "2.2"
indicatif = "0.17"
-interprocess = "2.0.1"
+interprocess = "2.1.0"
is_executable = "1.0"
itertools = "0.12"
libc = "0.2"
From 9bf4d3ece6484d6aeb23422447ec6b11b6fb7a7e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 09:06:09 +0800
Subject: [PATCH 28/42] Bump rust-embed from 8.3.0 to 8.4.0 (#12870)
Bumps [rust-embed](https://github.com/pyros2097/rust-embed) from 8.3.0
to 8.4.0.
Changelog
Sourced from rust-embed's
changelog.
[8.4.0] - 2024-05-11
- Re-export RustEmbed as Embed #245.
Thanks to pyrossh
- Do not build glob matchers repeatedly when include-exclude feature
is enabled #244.
Thanks to osiewicz
- Add
metadata_only attribute #241.
Thanks to ddfisher
- Replace
expect with a safer alternative that returns
None instead #240.
Thanks to costinsin
- Eliminate unnecessary
to_path call #239.
Thanks to smoelius
Commits
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
Cargo.lock | 12 ++++++------
Cargo.toml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index e3d29fef42..656f859a63 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5057,9 +5057,9 @@ dependencies = [
[[package]]
name = "rust-embed"
-version = "8.3.0"
+version = "8.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745"
+checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a"
dependencies = [
"rust-embed-impl",
"rust-embed-utils",
@@ -5068,9 +5068,9 @@ dependencies = [
[[package]]
name = "rust-embed-impl"
-version = "8.3.0"
+version = "8.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8"
+checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4"
dependencies = [
"proc-macro2",
"quote",
@@ -5081,9 +5081,9 @@ dependencies = [
[[package]]
name = "rust-embed-utils"
-version = "8.3.0"
+version = "8.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581"
+checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32"
dependencies = [
"sha2",
"walkdir",
diff --git a/Cargo.toml b/Cargo.toml
index 6b035ee0f8..1366ecbdd8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -140,7 +140,7 @@ ropey = "1.6.1"
roxmltree = "0.19"
rstest = { version = "0.18", default-features = false }
rusqlite = "0.31"
-rust-embed = "8.3.0"
+rust-embed = "8.4.0"
same-file = "1.0"
serde = { version = "1.0", default-features = false }
serde_json = "1.0"
From 155934f783e15c6ffb3a42119105799a625f7bbc Mon Sep 17 00:00:00 2001
From: Wind
Date: Wed, 15 May 2024 09:14:11 +0800
Subject: [PATCH 29/42] make better messages for incomplete string (#12868)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
# Description
Fixes: #12795
The issue is caused by an empty position of `ParseError::UnexpectedEof`.
So no detailed message is displayed.
To fix the issue, I adjust the start of span to `span.end - 1`. In this
way, we can make sure that it never points to an empty position.
After lexing item, I also reorder the unclosed character checking . Now
it will be checking unclosed opening delimiters first.
# User-Facing Changes
After this pr, it outputs detailed error message for incomplete string
when running scripts.
## Before
```
❯ nu -c "'ab"
Error: nu::parser::unexpected_eof
× Unexpected end of code.
╭─[source:1:4]
1 │ 'ab
╰────
> ./target/debug/nu -c "r#'ab"
Error: nu::parser::unexpected_eof
× Unexpected end of code.
╭─[source:1:6]
1 │ r#'ab
╰────
```
## After
```
> nu -c "'ab"
Error: nu::parser::unexpected_eof
× Unexpected end of code.
╭─[source:1:3]
1 │ 'ab
· ┬
· ╰── expected closing '
╰────
> ./target/debug/nu -c "r#'ab"
Error: nu::parser::unexpected_eof
× Unexpected end of code.
╭─[source:1:5]
1 │ r#'ab
· ┬
· ╰── expected closing '#
╰────
```
# Tests + Formatting
Added some tests for incomplete string.
---------
Co-authored-by: Ian Manske
---
crates/nu-parser/src/lex.rs | 42 ++++++++++++++++++++-----------------
tests/repl/test_strings.rs | 16 ++++++++++++--
2 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/crates/nu-parser/src/lex.rs b/crates/nu-parser/src/lex.rs
index f9e75d13f0..4639cae25d 100644
--- a/crates/nu-parser/src/lex.rs
+++ b/crates/nu-parser/src/lex.rs
@@ -129,7 +129,7 @@ pub fn lex_item(
},
Some(ParseError::UnexpectedEof(
(start as char).to_string(),
- Span::new(span.end, span.end),
+ Span::new(span.end - 1, span.end),
)),
);
}
@@ -247,21 +247,6 @@ pub fn lex_item(
let span = Span::new(span_offset + token_start, span_offset + *curr_offset);
- // If there is still unclosed opening delimiters, remember they were missing
- if let Some(block) = block_level.last() {
- let delim = block.closing();
- let cause =
- ParseError::UnexpectedEof((delim as char).to_string(), Span::new(span.end, span.end));
-
- return (
- Token {
- contents: TokenContents::Item,
- span,
- },
- Some(cause),
- );
- }
-
if let Some(delim) = quote_start {
// The non-lite parse trims quotes on both sides, so we add the expected quote so that
// anyone wanting to consume this partial parse (e.g., completions) will be able to get
@@ -273,11 +258,28 @@ pub fn lex_item(
},
Some(ParseError::UnexpectedEof(
(delim as char).to_string(),
- Span::new(span.end, span.end),
+ Span::new(span.end - 1, span.end),
)),
);
}
+ // If there is still unclosed opening delimiters, remember they were missing
+ if let Some(block) = block_level.last() {
+ let delim = block.closing();
+ let cause = ParseError::UnexpectedEof(
+ (delim as char).to_string(),
+ Span::new(span.end - 1, span.end),
+ );
+
+ return (
+ Token {
+ contents: TokenContents::Item,
+ span,
+ },
+ Some(cause),
+ );
+ }
+
// If we didn't accumulate any characters, it's an unexpected error.
if *curr_offset - token_start == 0 {
return (
@@ -395,9 +397,11 @@ fn lex_raw_string(
*curr_offset += 1
}
if !matches {
+ let mut expected = '\''.to_string();
+ expected.push_str(&"#".repeat(prefix_sharp_cnt));
return Err(ParseError::UnexpectedEof(
- "#".to_string(),
- Span::new(span_offset + *curr_offset, span_offset + *curr_offset),
+ expected,
+ Span::new(span_offset + *curr_offset - 1, span_offset + *curr_offset),
));
}
Ok(())
diff --git a/tests/repl/test_strings.rs b/tests/repl/test_strings.rs
index cafd6cc681..fa6c419e23 100644
--- a/tests/repl/test_strings.rs
+++ b/tests/repl/test_strings.rs
@@ -154,6 +154,18 @@ fn raw_string_inside_closure() -> TestResult {
}
#[test]
-fn incomplete_raw_string() -> TestResult {
- fail_test("r#abc", "expected '")
+fn incomplete_string() -> TestResult {
+ fail_test("r#abc", "expected '")?;
+ fail_test("r#'bc", "expected closing '#")?;
+ fail_test("'ab\"", "expected closing '")?;
+ fail_test("\"ab'", "expected closing \"")?;
+ fail_test(
+ r#"def func [] {
+ {
+ "A": ""B" # <- the quote is bad
+ }
+}
+"#,
+ "expected closing \"",
+ )
}
From a7807735b15ad377f281091a85afb3791d9df608 Mon Sep 17 00:00:00 2001
From: Andy Gayton
Date: Tue, 14 May 2024 21:48:27 -0400
Subject: [PATCH 30/42] Add a passing test for interactivity on slow pipelines
(#12865)
# Description
This PR adds a single test to assert interactivity on slow pipelines
Currently the timeout is set to 6 seconds, as the test can sometimes
take ~3secs to run on my local m1 mac air, which I don't think is an
indication of a slow pipeline, but rather slow test start up time...
---
tests/plugins/stream.rs | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tests/plugins/stream.rs b/tests/plugins/stream.rs
index ee62703017..8530e5bc32 100644
--- a/tests/plugins/stream.rs
+++ b/tests/plugins/stream.rs
@@ -1,3 +1,5 @@
+use rstest::rstest;
+
use nu_test_support::nu_with_plugins;
use pretty_assertions::assert_eq;
@@ -190,3 +192,18 @@ fn generate_sequence() {
assert_eq!(actual.out, "[0,2,4,6,8,10]");
}
+
+#[rstest]
+#[timeout(std::time::Duration::from_secs(6))]
+fn echo_interactivity_on_slow_pipelines() {
+ // This test works by putting 0 on the upstream immediately, followed by 1 after 10 seconds.
+ // If values aren't streamed to the plugin as they become available, `example echo` won't emit
+ // anything until both 0 and 1 are available. The desired behavior is that `example echo` gets
+ // the 0 immediately, which is consumed by `first`, allowing the pipeline to terminate early.
+ let actual = nu_with_plugins!(
+ cwd: "tests/fixtures/formats",
+ plugin: ("nu_plugin_example"),
+ r#"[1] | each { |n| sleep 10sec; $n } | prepend 0 | example echo | first"#
+ );
+ assert_eq!(actual.out, "0");
+}
From 0cfbdc909e7e04138881eee714eaeea762e4a5c5 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Wed, 15 May 2024 07:40:04 +0000
Subject: [PATCH 31/42] Fix `sys` panic (#12846)
# Description
This should fix #10155 where the `sys` command can panic due to date
math in certain cases / on certain systems.
# User-Facing Changes
The `boot_time` column now has a date value instead of a formatted date
string. This is technically a breaking change.
---
crates/nu-command/src/system/sys/mod.rs | 34 +++++++++++++++----------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/crates/nu-command/src/system/sys/mod.rs b/crates/nu-command/src/system/sys/mod.rs
index 5e0467c251..fcb40fd37d 100644
--- a/crates/nu-command/src/system/sys/mod.rs
+++ b/crates/nu-command/src/system/sys/mod.rs
@@ -16,9 +16,8 @@ pub use sys_::Sys;
pub use temp::SysTemp;
pub use users::SysUsers;
-use chrono::{DateTime, Local};
+use chrono::{DateTime, FixedOffset, Local};
use nu_protocol::{record, Record, Span, Value};
-use std::time::{Duration, UNIX_EPOCH};
use sysinfo::{
Components, CpuRefreshKind, Disks, Networks, System, Users, MINIMUM_CPU_UPDATE_INTERVAL,
};
@@ -171,22 +170,31 @@ pub fn host(span: Span) -> Record {
record.push("hostname", Value::string(trim_cstyle_null(hostname), span));
}
- record.push(
- "uptime",
- Value::duration(1000000000 * System::uptime() as i64, span),
- );
+ let uptime = System::uptime()
+ .saturating_mul(1_000_000_000)
+ .try_into()
+ .unwrap_or(i64::MAX);
- // Creates a new SystemTime from the specified number of whole seconds
- let d = UNIX_EPOCH + Duration::from_secs(System::boot_time());
- // Create DateTime from SystemTime
- let datetime = DateTime::::from(d);
- // Convert to local time and then rfc3339
- let timestamp_str = datetime.with_timezone(datetime.offset()).to_rfc3339();
- record.push("boot_time", Value::string(timestamp_str, span));
+ record.push("uptime", Value::duration(uptime, span));
+
+ let boot_time = boot_time()
+ .map(|time| Value::date(time, span))
+ .unwrap_or(Value::nothing(span));
+
+ record.push("boot_time", boot_time);
record
}
+fn boot_time() -> Option> {
+ // Broken systems can apparently return really high values.
+ // See: https://github.com/nushell/nushell/issues/10155
+ // First, try to convert u64 to i64, and then try to create a `DateTime`.
+ let secs = System::boot_time().try_into().ok()?;
+ let time = DateTime::from_timestamp(secs, 0)?;
+ Some(time.with_timezone(&Local).fixed_offset())
+}
+
pub fn temp(span: Span) -> Value {
let components = Components::new_with_refreshed_list()
.iter()
From defed3001da941e76f3df059544f689fe85c6cc0 Mon Sep 17 00:00:00 2001
From: Darren Schroeder <343840+fdncred@users.noreply.github.com>
Date: Wed, 15 May 2024 09:44:09 -0500
Subject: [PATCH 32/42] make it clearer what is being loaded with --log-level
info (#12875)
# Description
A common question we get is what config files are loaded when and with
what parameters. It's for this reason that I wrote [this
gist](https://gist.github.com/fdncred/b87b784f04984dc31a150baed9ad2447).
Another way to figure this out is to use `nu --log-level info`. This
will show some performance timings but will also show what is being
loaded when. For the most part the `[INFO]` lines show the performance
timings and the `[WARN]` lines show the files.
This PR tries to make things a little bit clearer when using the
`--log-level info` parameter.
# User-Facing Changes
# Tests + Formatting
# After Submitting
---
src/config_files.rs | 51 ++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 21 deletions(-)
diff --git a/src/config_files.rs b/src/config_files.rs
index ba8a3436a0..ec4511860f 100644
--- a/src/config_files.rs
+++ b/src/config_files.rs
@@ -1,4 +1,4 @@
-use log::{info, trace};
+use log::warn;
#[cfg(feature = "plugin")]
use nu_cli::read_plugin_file;
use nu_cli::{eval_config_contents, eval_source};
@@ -27,7 +27,10 @@ pub(crate) fn read_config_file(
config_file: Option>,
is_env_config: bool,
) {
- trace!("read_config_file {:?}", &config_file);
+ warn!(
+ "read_config_file() config_file_specified: {:?}, is_env_config: {is_env_config}",
+ &config_file
+ );
// Load config startup file
if let Some(file) = config_file {
let working_set = StateWorkingSet::new(engine_state);
@@ -122,21 +125,27 @@ pub(crate) fn read_config_file(
}
pub(crate) fn read_loginshell_file(engine_state: &mut EngineState, stack: &mut Stack) {
+ warn!(
+ "read_loginshell_file() {}:{}:{}",
+ file!(),
+ line!(),
+ column!()
+ );
+
// read and execute loginshell file if exists
if let Some(mut config_path) = nu_path::config_dir() {
config_path.push(NUSHELL_FOLDER);
config_path.push(LOGINSHELL_FILE);
+ warn!("loginshell_file: {}", config_path.display());
+
if config_path.exists() {
eval_config_contents(config_path, engine_state, stack);
}
}
-
- info!("read_loginshell_file {}:{}:{}", file!(), line!(), column!());
}
pub(crate) fn read_default_env_file(engine_state: &mut EngineState, stack: &mut Stack) {
- trace!("read_default_env_file");
let config_file = get_default_env();
eval_source(
engine_state,
@@ -147,7 +156,13 @@ pub(crate) fn read_default_env_file(engine_state: &mut EngineState, stack: &mut
false,
);
- info!("read_config_file {}:{}:{}", file!(), line!(), column!());
+ warn!(
+ "read_default_env_file() env_file_contents: {config_file} {}:{}:{}",
+ file!(),
+ line!(),
+ column!()
+ );
+
// Merge the environment in case env vars changed in the config
match engine_state.cwd(Some(stack)) {
Ok(cwd) => {
@@ -167,10 +182,9 @@ fn eval_default_config(
config_file: &str,
is_env_config: bool,
) {
- trace!(
- "eval_default_config: config_file: {:?}, is_env_config: {}",
- &config_file,
- is_env_config
+ warn!(
+ "eval_default_config() config_file_specified: {:?}, is_env_config: {}",
+ &config_file, is_env_config
);
println!("Continuing without config file");
// Just use the contents of "default_config.nu" or "default_env.nu"
@@ -208,11 +222,9 @@ pub(crate) fn setup_config(
env_file: Option>,
is_login_shell: bool,
) {
- trace!(
- "setup_config: config: {:?}, env: {:?}, login: {}",
- &config_file,
- &env_file,
- is_login_shell
+ warn!(
+ "setup_config() config_file_specified: {:?}, env_file_specified: {:?}, login: {}",
+ &config_file, &env_file, is_login_shell
);
let result = catch_unwind(AssertUnwindSafe(|| {
#[cfg(feature = "plugin")]
@@ -240,12 +252,9 @@ pub(crate) fn set_config_path(
key: &str,
config_file: Option<&Spanned>,
) {
- trace!(
- "set_config_path: cwd: {:?}, default_config: {}, key: {}, config_file: {:?}",
- &cwd,
- &default_config_name,
- &key,
- &config_file
+ warn!(
+ "set_config_path() cwd: {:?}, default_config: {}, key: {}, config_file_specified: {:?}",
+ &cwd, &default_config_name, &key, &config_file
);
let config_path = match config_file {
Some(s) => canonicalize_with(&s.item, cwd).ok(),
From 72b880662b75d5a418369dec98288351769a3990 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 15 May 2024 12:16:59 -0400
Subject: [PATCH 33/42] Fixed a nitpick usage-help error - closure v. block
(#12876)
# Description
So minor, but had to be fixed sometime. `help each while` used the term
"block" in the "usage", but the argument type is a closure.
# User-Facing Changes
help-only
---
crates/nu-cmd-extra/src/extra/filters/each_while.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crates/nu-cmd-extra/src/extra/filters/each_while.rs b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
index 2dda815d43..939f194f43 100644
--- a/crates/nu-cmd-extra/src/extra/filters/each_while.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
@@ -10,7 +10,7 @@ impl Command for EachWhile {
}
fn usage(&self) -> &str {
- "Run a block on each row of the input list until a null is found, then create a new list with the results."
+ "Run a closure on each row of the input list until a null is found, then create a new list with the results."
}
fn search_terms(&self) -> Vec<&str> {
From b08135d877d94279d4250d0ae5d0ee2887530c53 Mon Sep 17 00:00:00 2001
From: NotTheDr01ds <32344964+NotTheDr01ds@users.noreply.github.com>
Date: Wed, 15 May 2024 13:49:08 -0400
Subject: [PATCH 34/42] Fixed small error in the help-examples for the get
command (#12877)
# Description
Another small error in Help, this time for the `get` command example.
# User-Facing Changes
Help only
---
crates/nu-command/src/filters/get.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crates/nu-command/src/filters/get.rs b/crates/nu-command/src/filters/get.rs
index c30ad1f3a4..a481372db1 100644
--- a/crates/nu-command/src/filters/get.rs
+++ b/crates/nu-command/src/filters/get.rs
@@ -115,7 +115,7 @@ If multiple cell paths are given, this will produce a list of values."#
},
Example {
description:
- "Extract the name of the 3rd record in a list (same as `ls | $in.name`)",
+ "Extract the name of the 3rd record in a list (same as `ls | $in.name.2`)",
example: "ls | get name.2",
result: None,
},
From 06fe7d1e16c405a72ad08b2dc68b83fd947ddeba Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Wed, 15 May 2024 17:59:42 +0000
Subject: [PATCH 35/42] Remove usages of `Call::positional_nth` (#12871)
# Description
Following from #12867, this PR replaces usages of `Call::positional_nth`
with existing spans. This removes several `expect`s from the code.
Also remove unused `positional_nth_mut` and `positional_iter_mut`
---
crates/nu-command/src/env/with_env.rs | 10 ++--------
crates/nu-command/src/filesystem/touch.rs | 17 ++++-------------
crates/nu-command/src/platform/ansi/ansi_.rs | 5 +----
crates/nu-protocol/src/ast/call.rs | 20 --------------------
4 files changed, 7 insertions(+), 45 deletions(-)
diff --git a/crates/nu-command/src/env/with_env.rs b/crates/nu-command/src/env/with_env.rs
index 7eaf64cb54..ff66d21f49 100644
--- a/crates/nu-command/src/env/with_env.rs
+++ b/crates/nu-command/src/env/with_env.rs
@@ -90,10 +90,7 @@ fn with_env(
return Err(ShellError::CantConvert {
to_type: "record".into(),
from_type: x.get_type().to_string(),
- span: call
- .positional_nth(1)
- .expect("already checked through .req")
- .span,
+ span: x.span(),
help: None,
});
}
@@ -124,10 +121,7 @@ fn with_env(
return Err(ShellError::CantConvert {
to_type: "record".into(),
from_type: x.get_type().to_string(),
- span: call
- .positional_nth(1)
- .expect("already checked through .req")
- .span,
+ span: x.span(),
help: None,
});
}
diff --git a/crates/nu-command/src/filesystem/touch.rs b/crates/nu-command/src/filesystem/touch.rs
index ce8ed0dad3..08843b11f0 100644
--- a/crates/nu-command/src/filesystem/touch.rs
+++ b/crates/nu-command/src/filesystem/touch.rs
@@ -117,7 +117,7 @@ impl Command for Touch {
#[allow(deprecated)]
let cwd = current_dir(engine_state, stack)?;
- for (index, glob) in files.into_iter().enumerate() {
+ for glob in files {
let path = expand_path_with(glob.item.as_ref(), &cwd, glob.item.is_expand());
// If --no-create is passed and the file/dir does not exist there's nothing to do
@@ -135,10 +135,7 @@ impl Command for Touch {
{
return Err(ShellError::CreateNotPossible {
msg: format!("Failed to create file: {err}"),
- span: call
- .positional_nth(index)
- .expect("already checked positional")
- .span,
+ span: glob.span,
});
};
}
@@ -148,10 +145,7 @@ impl Command for Touch {
{
return Err(ShellError::ChangeModifiedTimeNotPossible {
msg: format!("Failed to change the modified time: {err}"),
- span: call
- .positional_nth(index)
- .expect("already checked positional")
- .span,
+ span: glob.span,
});
};
}
@@ -161,10 +155,7 @@ impl Command for Touch {
{
return Err(ShellError::ChangeAccessTimeNotPossible {
msg: format!("Failed to change the access time: {err}"),
- span: call
- .positional_nth(index)
- .expect("already checked positional")
- .span,
+ span: glob.span,
});
};
}
diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs
index 427c7c3a73..9e0b0bba66 100644
--- a/crates/nu-command/src/platform/ansi/ansi_.rs
+++ b/crates/nu-command/src/platform/ansi/ansi_.rs
@@ -784,10 +784,7 @@ fn heavy_lifting(code: Value, escape: bool, osc: bool, call: &Call) -> Result {
return Err(ShellError::TypeMismatch {
err_message: String::from("Unknown ansi code"),
- span: call
- .positional_nth(0)
- .expect("Unexpected missing argument")
- .span,
+ span: code.span(),
})
}
}
diff --git a/crates/nu-protocol/src/ast/call.rs b/crates/nu-protocol/src/ast/call.rs
index 6689bc3a55..9aaf17d5db 100644
--- a/crates/nu-protocol/src/ast/call.rs
+++ b/crates/nu-protocol/src/ast/call.rs
@@ -154,30 +154,10 @@ impl Call {
})
}
- pub fn positional_iter_mut(&mut self) -> impl Iterator- {
- self.arguments
- .iter_mut()
- .take_while(|arg| match arg {
- Argument::Spread(_) => false, // Don't include positional arguments given to rest parameter
- _ => true,
- })
- .filter_map(|arg| match arg {
- Argument::Named(_) => None,
- Argument::Positional(positional) => Some(positional),
- Argument::Unknown(unknown) => Some(unknown),
- Argument::Spread(_) => None,
- })
- }
-
pub fn positional_nth(&self, i: usize) -> Option<&Expression> {
self.positional_iter().nth(i)
}
- // TODO this method is never used. Delete?
- pub fn positional_nth_mut(&mut self, i: usize) -> Option<&mut Expression> {
- self.positional_iter_mut().nth(i)
- }
-
pub fn positional_len(&self) -> usize {
self.positional_iter().count()
}
From 6f3dbc97bb77296b68e6da8a9c09d1a5ce5e9003 Mon Sep 17 00:00:00 2001
From: Jack Wright <56345+ayax79@users.noreply.github.com>
Date: Wed, 15 May 2024 14:55:07 -0700
Subject: [PATCH 36/42] fixed syntax shape requirements for --quantiles option
for polars summary (#12878)
Fix for #12730
All of the code expected a list of floats, but the syntax shape expected
a table. Resolved by changing the syntax shape to list of floats.
cc: @maxim-uvarov
---
crates/nu_plugin_polars/src/dataframe/eager/summary.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs b/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
index 8e5151837d..2b22d73bfb 100644
--- a/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
+++ b/crates/nu_plugin_polars/src/dataframe/eager/summary.rs
@@ -38,7 +38,7 @@ impl PluginCommand for Summary {
)
.named(
"quantiles",
- SyntaxShape::Table(vec![]),
+ SyntaxShape::List(Box::new(SyntaxShape::Float)),
"provide optional quantiles",
Some('q'),
)
From e20113a0eb8622e27f2ed203f2b628c3d2f7e5f5 Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Wed, 15 May 2024 22:59:10 +0000
Subject: [PATCH 37/42] Remove stack debug assert (#12861)
# Description
In order for `Stack::unwrap_unique` to work as intended, we currently
manually track all references to the parent stack and ensure that they
are cleared before calling `Stack::unwrap_unique` in the REPL. We also
only call `Stack::unwrap_unique` after all code from the current REPL
entry has finished executing. Since `Value`s cannot store `Stack`
references, then this should have worked in theory. However, we forgot
to account for threads. `run-external` (and maybe the plugin writers)
can spawn threads that clone the `Stack`, holding on to references of
the parent stack. These threads are not waited/joined upon, and so may
finish after the eval has already returned. This PR removes the
`Stack::unwrap_unique` function and associated debug assert that was
[causing
panics](https://gist.github.com/cablehead/f3d2608a1629e607c2d75290829354f7)
like @cablehead found.
# After Submitting
Make values cheaper to clone as a more robust solution to the
performance issues with cloning the stack.
---------
Co-authored-by: Wind
---
crates/nu-cli/src/repl.rs | 4 +++-
crates/nu-protocol/src/engine/stack.rs | 32 ++++++--------------------
2 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/crates/nu-cli/src/repl.rs b/crates/nu-cli/src/repl.rs
index 2482a7920e..29c2f62734 100644
--- a/crates/nu-cli/src/repl.rs
+++ b/crates/nu-cli/src/repl.rs
@@ -542,7 +542,9 @@ fn loop_iteration(ctx: LoopContext) -> (bool, Stack, Reedline) {
let shell_integration_osc633 = config.shell_integration_osc633;
let shell_integration_reset_application_mode = config.shell_integration_reset_application_mode;
- let mut stack = Stack::unwrap_unique(stack_arc);
+ // TODO: we may clone the stack, this can lead to major performance issues
+ // so we should avoid it or making stack cheaper to clone.
+ let mut stack = Arc::unwrap_or_clone(stack_arc);
perf(
"line_editor setup",
diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs
index 65f2981fbf..19726db9c0 100644
--- a/crates/nu-protocol/src/engine/stack.rs
+++ b/crates/nu-protocol/src/engine/stack.rs
@@ -75,26 +75,10 @@ impl Stack {
}
}
- /// Unwrap a uniquely-owned stack.
- ///
- /// In debug mode, this panics if there are multiple references.
- /// In production this will instead clone the underlying stack.
- pub fn unwrap_unique(stack_arc: Arc) -> Stack {
- // If you hit an error here, it's likely that you created an extra
- // Arc pointing to the stack somewhere. Make sure that it gets dropped before
- // getting here!
- Arc::try_unwrap(stack_arc).unwrap_or_else(|arc| {
- // in release mode, we clone the stack, but this can lead to
- // major performance issues, so we should avoid it
- debug_assert!(false, "More than one stack reference remaining!");
- (*arc).clone()
- })
- }
-
/// Create a new child stack from a parent.
///
/// Changes from this child can be merged back into the parent with
- /// Stack::with_changes_from_child
+ /// [`Stack::with_changes_from_child`]
pub fn with_parent(parent: Arc) -> Stack {
Stack {
// here we are still cloning environment variable-related information
@@ -109,19 +93,17 @@ impl Stack {
}
}
- /// Take an Arc of a parent (assumed to be unique), and a child, and apply
- /// all the changes from a child back to the parent.
+ /// Take an [`Arc`] parent, and a child, and apply all the changes from a child back to the parent.
///
- /// Here it is assumed that child was created with a call to Stack::with_parent
- /// with parent
+ /// Here it is assumed that `child` was created by a call to [`Stack::with_parent`] with `parent`.
+ ///
+ /// For this to be performant and not clone `parent`, `child` should be the only other
+ /// referencer of `parent`.
pub fn with_changes_from_child(parent: Arc, child: Stack) -> Stack {
// we're going to drop the link to the parent stack on our new stack
// so that we can unwrap the Arc as a unique reference
- //
- // This makes the new_stack be in a bit of a weird state, so we shouldn't call
- // any structs
drop(child.parent_stack);
- let mut unique_stack = Stack::unwrap_unique(parent);
+ let mut unique_stack = Arc::unwrap_or_clone(parent);
unique_stack
.vars
From 1b8eb23785be7efdb7b1511416da77959ee6561b Mon Sep 17 00:00:00 2001
From: Wind
Date: Thu, 16 May 2024 16:50:29 +0800
Subject: [PATCH 38/42] allow passing float value to custom command (#12879)
# Description
Fixes: #12691
In `parse_short_flag`, it only checks special cases for
`SyntaxShape::Int`, `SyntaxShape::Number` to allow a flag to be a
number. This pr adds `SyntaxShape::Float` to allow a flag to be float
number.
# User-Facing Changes
This is possible after this pr:
```nushell
def spam [val: float] { $val };
spam -1.4
```
# Tests + Formatting
Added 1 test
---
crates/nu-parser/src/parser.rs | 2 +-
tests/repl/test_custom_commands.rs | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs
index 3416e538df..0f72132d10 100644
--- a/crates/nu-parser/src/parser.rs
+++ b/crates/nu-parser/src/parser.rs
@@ -486,7 +486,7 @@ fn parse_short_flags(
&& matches!(
sig.get_positional(positional_idx),
Some(PositionalArg {
- shape: SyntaxShape::Int | SyntaxShape::Number,
+ shape: SyntaxShape::Int | SyntaxShape::Number | SyntaxShape::Float,
..
})
)
diff --git a/tests/repl/test_custom_commands.rs b/tests/repl/test_custom_commands.rs
index 43a24fa250..1f36b0e90c 100644
--- a/tests/repl/test_custom_commands.rs
+++ b/tests/repl/test_custom_commands.rs
@@ -274,3 +274,9 @@ fn dont_allow_implicit_casting_between_glob_and_string() -> TestResult {
"can't convert",
)
}
+
+#[test]
+fn allow_pass_negative_float() -> TestResult {
+ run_test("def spam [val: float] { $val }; spam -1.4", "-1.4")?;
+ run_test("def spam [val: float] { $val }; spam -2", "-2")
+}
From 6fd854ed9f25070e1f5456b4c96d76d5283f188d Mon Sep 17 00:00:00 2001
From: Ian Manske
Date: Thu, 16 May 2024 14:11:18 +0000
Subject: [PATCH 39/42] Replace `ExternalStream` with new `ByteStream` type
(#12774)
# Description
This PR introduces a `ByteStream` type which is a `Read`-able stream of
bytes. Internally, it has an enum over three different byte stream
sources:
```rust
pub enum ByteStreamSource {
Read(Box),
File(File),
Child(ChildProcess),
}
```
This is in comparison to the current `RawStream` type, which is an
`Iterator
- >` and has to allocate for each read chunk.
Currently, `PipelineData::ExternalStream` serves a weird dual role where
it is either external command output or a wrapper around `RawStream`.
`ByteStream` makes this distinction more clear (via `ByteStreamSource`)
and replaces `PipelineData::ExternalStream` in this PR:
```rust
pub enum PipelineData {
Empty,
Value(Value, Option),
ListStream(ListStream, Option),
ByteStream(ByteStream, Option),
}
```
The PR is relatively large, but a decent amount of it is just repetitive
changes.
This PR fixes #7017, fixes #10763, and fixes #12369.
This PR also improves performance when piping external commands. Nushell
should, in most cases, have competitive pipeline throughput compared to,
e.g., bash.
| Command | Before (MB/s) | After (MB/s) | Bash (MB/s) |
| -------------------------------------------------- | -------------:|
------------:| -----------:|
| `throughput \| rg 'x'` | 3059 | 3744 | 3739 |
| `throughput \| nu --testbin relay o> /dev/null` | 3508 | 8087 | 8136 |
# User-Facing Changes
- This is a breaking change for the plugin communication protocol,
because the `ExternalStreamInfo` was replaced with `ByteStreamInfo`.
Plugins now only have to deal with a single input stream, as opposed to
the previous three streams: stdout, stderr, and exit code.
- The output of `describe` has been changed for external/byte streams.
- Temporary breaking change: `bytes starts-with` no longer works with
byte streams. This is to keep the PR smaller, and `bytes ends-with`
already does not work on byte streams.
- If a process core dumped, then instead of having a `Value::Error` in
the `exit_code` column of the output returned from `complete`, it now is
a `Value::Int` with the negation of the signal number.
# After Submitting
- Update docs and book as necessary
- Release notes (e.g., plugin protocol changes)
- Adapt/convert commands to work with byte streams (high priority is
`str length`, `bytes starts-with`, and maybe `bytes ends-with`).
- Refactor the `tee` code, Devyn has already done some work on this.
---------
Co-authored-by: Devyn Cairns
---
Cargo.lock | 1 +
crates/nu-cli/src/completions/completer.rs | 5 +-
.../src/completions/custom_completions.rs | 84 +-
crates/nu-cli/src/config_files.rs | 5 +-
crates/nu-cli/src/eval_cmds.rs | 8 +-
crates/nu-cli/src/eval_file.rs | 23 +-
crates/nu-cli/src/menus/menu_completions.rs | 3 +-
crates/nu-cli/src/util.rs | 144 +-
.../src/dataframe/eager/cast.rs | 2 +-
.../src/dataframe/eager/filter_with.rs | 3 +-
.../src/dataframe/eager/first.rs | 2 +-
.../src/dataframe/eager/last.rs | 2 +-
.../src/dataframe/eager/rename.rs | 3 +-
.../src/dataframe/eager/to_nu.rs | 2 +-
.../src/dataframe/eager/with_column.rs | 3 +-
.../expressions/expressions_macro.rs | 4 +-
.../src/dataframe/expressions/otherwise.rs | 2 +-
.../src/dataframe/expressions/quantile.rs | 2 +-
.../src/dataframe/expressions/when.rs | 2 +-
.../src/dataframe/lazy/explode.rs | 2 +-
.../src/dataframe/lazy/fill_nan.rs | 2 +-
.../src/dataframe/lazy/fill_null.rs | 2 +-
.../src/dataframe/lazy/join.rs | 2 +-
.../src/dataframe/lazy/quantile.rs | 2 +-
.../src/dataframe/series/masks/is_not_null.rs | 2 +-
.../src/dataframe/series/masks/is_null.rs | 2 +-
.../src/dataframe/series/n_unique.rs | 2 +-
.../src/dataframe/series/shift.rs | 3 +-
.../src/dataframe/series/unique.rs | 3 +-
.../src/dataframe/test_dataframe.rs | 3 +-
.../src/dataframe/values/nu_dataframe/mod.rs | 2 +-
.../src/dataframe/values/nu_expression/mod.rs | 2 +-
.../src/dataframe/values/nu_lazyframe/mod.rs | 2 +-
.../dataframe/values/nu_lazygroupby/mod.rs | 2 +-
crates/nu-cmd-extra/src/extra/bits/into.rs | 22 +-
.../src/extra/filters/each_while.rs | 50 +-
.../src/extra/filters/roll/roll_down.rs | 2 +-
.../src/extra/filters/roll/roll_left.rs | 2 +-
.../src/extra/filters/roll/roll_right.rs | 2 +-
.../src/extra/filters/roll/roll_up.rs | 2 +-
.../src/extra/filters/update_cells.rs | 2 +-
.../src/extra/strings/format/command.rs | 2 +-
.../tests/commands/bytes/starts_with.rs | 160 +--
.../nu-cmd-lang/src/core_commands/collect.rs | 2 +-
.../nu-cmd-lang/src/core_commands/describe.rs | 77 +-
crates/nu-cmd-lang/src/core_commands/do_.rs | 181 ++-
crates/nu-cmd-lang/src/core_commands/for_.rs | 30 +-
crates/nu-cmd-lang/src/core_commands/let_.rs | 2 +-
crates/nu-cmd-lang/src/core_commands/loop_.rs | 12 +-
crates/nu-cmd-lang/src/core_commands/mut_.rs | 2 +-
crates/nu-cmd-lang/src/core_commands/try_.rs | 7 +-
.../nu-cmd-lang/src/core_commands/while_.rs | 18 +-
crates/nu-cmd-lang/src/example_support.rs | 7 +-
crates/nu-color-config/src/style_computer.rs | 6 +-
crates/nu-command/src/bytes/starts_with.rs | 64 +-
crates/nu-command/src/charting/histogram.rs | 2 +-
.../nu-command/src/conversions/into/binary.rs | 28 +-
.../src/conversions/into/cell_path.rs | 6 +-
.../nu-command/src/conversions/into/glob.rs | 20 +-
.../nu-command/src/conversions/into/record.rs | 2 +-
.../nu-command/src/conversions/into/string.rs | 30 +-
.../nu-command/src/database/values/sqlite.rs | 2 +-
crates/nu-command/src/debug/inspect.rs | 2 +-
crates/nu-command/src/debug/timeit.rs | 5 +-
crates/nu-command/src/filesystem/open.rs | 30 +-
crates/nu-command/src/filesystem/save.rs | 240 ++--
crates/nu-command/src/filters/columns.rs | 8 +-
crates/nu-command/src/filters/drop/column.rs | 6 +-
crates/nu-command/src/filters/each.rs | 64 +-
crates/nu-command/src/filters/empty.rs | 38 +-
crates/nu-command/src/filters/filter.rs | 63 +-
crates/nu-command/src/filters/find.rs | 72 +-
crates/nu-command/src/filters/first.rs | 6 +-
crates/nu-command/src/filters/get.rs | 2 +-
crates/nu-command/src/filters/group_by.rs | 2 +-
crates/nu-command/src/filters/headers.rs | 2 +-
crates/nu-command/src/filters/insert.rs | 10 +-
crates/nu-command/src/filters/items.rs | 25 +-
crates/nu-command/src/filters/join.rs | 2 +-
crates/nu-command/src/filters/last.rs | 14 +-
crates/nu-command/src/filters/lines.rs | 175 +--
crates/nu-command/src/filters/par_each.rs | 102 +-
crates/nu-command/src/filters/reduce.rs | 2 +-
crates/nu-command/src/filters/reject.rs | 2 +-
crates/nu-command/src/filters/skip/skip_.rs | 7 +-
.../nu-command/src/filters/skip/skip_until.rs | 3 +-
.../nu-command/src/filters/skip/skip_while.rs | 3 +-
crates/nu-command/src/filters/take/take_.rs | 14 +-
.../nu-command/src/filters/take/take_until.rs | 3 +-
.../nu-command/src/filters/take/take_while.rs | 3 +-
crates/nu-command/src/filters/tee.rs | 460 +++++--
crates/nu-command/src/filters/update.rs | 8 +-
crates/nu-command/src/filters/upsert.rs | 18 +-
crates/nu-command/src/filters/utils.rs | 2 +-
crates/nu-command/src/filters/values.rs | 8 +-
crates/nu-command/src/filters/where_.rs | 11 +-
crates/nu-command/src/filters/wrap.rs | 4 +-
crates/nu-command/src/formats/from/json.rs | 2 +-
crates/nu-command/src/formats/from/msgpack.rs | 73 +-
.../nu-command/src/formats/from/msgpackz.rs | 22 +-
crates/nu-command/src/formats/from/ods.rs | 40 +-
crates/nu-command/src/formats/from/xlsx.rs | 38 +-
crates/nu-command/src/formats/to/delimited.rs | 2 +-
crates/nu-command/src/formats/to/json.rs | 2 +-
crates/nu-command/src/formats/to/msgpack.rs | 2 +-
crates/nu-command/src/formats/to/msgpackz.rs | 2 +-
crates/nu-command/src/formats/to/nuon.rs | 2 +-
crates/nu-command/src/formats/to/text.rs | 79 +-
crates/nu-command/src/formats/to/toml.rs | 2 +-
crates/nu-command/src/formats/to/xml.rs | 2 +-
crates/nu-command/src/formats/to/yaml.rs | 2 +-
crates/nu-command/src/generators/generate.rs | 18 +-
crates/nu-command/src/hash/generic_digest.rs | 60 +-
crates/nu-command/src/misc/tutor.rs | 10 +-
crates/nu-command/src/network/http/client.rs | 39 +-
crates/nu-command/src/network/url/parse.rs | 2 +-
crates/nu-command/src/path/join.rs | 4 +-
crates/nu-command/src/progress_bar.rs | 12 -
.../src/strings/encode_decode/decode.rs | 12 +-
.../src/strings/encode_decode/encode.rs | 9 +-
crates/nu-command/src/strings/parse.rs | 37 +-
crates/nu-command/src/system/complete.rs | 98 +-
crates/nu-command/src/system/nu_check.rs | 16 +-
crates/nu-command/src/system/run_external.rs | 369 ++---
crates/nu-command/src/viewers/table.rs | 47 +-
.../tests/format_conversions/csv.rs | 1 +
.../tests/format_conversions/tsv.rs | 1 +
crates/nu-engine/src/documentation.rs | 4 +-
crates/nu-engine/src/env.rs | 17 +-
crates/nu-engine/src/eval.rs | 118 +-
crates/nu-explore/src/nu_common/value.rs | 78 +-
crates/nu-plugin-core/src/interface/mod.rs | 164 +--
crates/nu-plugin-core/src/interface/tests.rs | 209 +--
crates/nu-plugin-engine/src/context.rs | 2 +-
crates/nu-plugin-engine/src/init.rs | 2 +-
crates/nu-plugin-engine/src/interface/mod.rs | 10 +-
.../nu-plugin-engine/src/interface/tests.rs | 61 +-
crates/nu-plugin-protocol/src/lib.rs | 59 +-
crates/nu-plugin-test-support/src/lib.rs | 2 +-
.../nu-plugin-test-support/src/plugin_test.rs | 65 +-
.../tests/custom_value/mod.rs | 2 +-
.../nu-plugin-test-support/tests/hello/mod.rs | 2 +-
.../tests/lowercase/mod.rs | 2 +-
crates/nu-plugin/src/plugin/command.rs | 2 +-
crates/nu-plugin/src/plugin/interface/mod.rs | 6 +-
.../nu-plugin/src/plugin/interface/tests.rs | 20 +-
crates/nu-plugin/src/plugin/mod.rs | 2 +-
crates/nu-protocol/Cargo.toml | 4 +
.../src/debugger/debugger_trait.rs | 6 +-
crates/nu-protocol/src/debugger/profiler.rs | 8 +-
crates/nu-protocol/src/errors/shell_error.rs | 70 +-
crates/nu-protocol/src/eval_const.rs | 7 +-
crates/nu-protocol/src/lib.rs | 7 +-
.../nu-protocol/src/pipeline/byte_stream.rs | 822 ++++++++++++
.../list_stream.rs | 0
.../{pipeline_data => pipeline}/metadata.rs | 0
crates/nu-protocol/src/pipeline/mod.rs | 11 +
.../{pipeline_data => pipeline}/out_dest.rs | 8 +-
.../nu-protocol/src/pipeline/pipeline_data.rs | 725 ++++++++++
crates/nu-protocol/src/pipeline_data/mod.rs | 1185 -----------------
.../src/pipeline_data/raw_stream.rs | 176 ---
crates/nu-protocol/src/process/child.rs | 294 ++++
crates/nu-protocol/src/process/exit_status.rs | 64 +
crates/nu-protocol/src/process/mod.rs | 5 +
crates/nu-protocol/src/util.rs | 52 -
.../nu-protocol/tests/test_pipeline_data.rs | 2 +-
crates/nu-system/src/foreground.rs | 6 +-
.../{collect_external.rs => collect_bytes.rs} | 39 +-
crates/nu_plugin_example/src/commands/mod.rs | 4 +-
crates/nu_plugin_example/src/lib.rs | 2 +-
crates/nu_plugin_polars/src/cache/rm.rs | 2 +-
.../src/dataframe/eager/to_arrow.rs | 2 +-
.../src/dataframe/eager/to_avro.rs | 2 +-
.../src/dataframe/eager/to_csv.rs | 2 +-
.../src/dataframe/eager/to_json_lines.rs | 2 +-
.../src/dataframe/eager/to_nu.rs | 2 +-
.../src/dataframe/eager/to_parquet.rs | 2 +-
.../expressions/expressions_macro.rs | 4 +-
.../src/dataframe/expressions/is_in.rs | 3 +-
.../src/dataframe/expressions/otherwise.rs | 2 +-
.../src/dataframe/expressions/when.rs | 2 +-
.../src/dataframe/lazy/cast.rs | 2 +-
.../src/dataframe/lazy/collect.rs | 2 +-
.../src/dataframe/lazy/explode.rs | 11 +-
.../src/dataframe/lazy/fetch.rs | 2 +-
.../src/dataframe/lazy/fill_nan.rs | 2 +-
.../src/dataframe/lazy/fill_null.rs | 2 +-
.../src/dataframe/lazy/filter.rs | 2 +-
.../src/dataframe/lazy/filter_with.rs | 2 +-
.../src/dataframe/lazy/first.rs | 2 +-
.../src/dataframe/lazy/groupby.rs | 2 +-
.../src/dataframe/lazy/join.rs | 2 +-
.../src/dataframe/lazy/last.rs | 2 +-
.../src/dataframe/lazy/median.rs | 2 +-
.../src/dataframe/lazy/quantile.rs | 2 +-
.../src/dataframe/lazy/rename.rs | 2 +-
.../src/dataframe/lazy/select.rs | 2 +-
.../src/dataframe/lazy/sort_by_expr.rs | 2 +-
.../src/dataframe/lazy/with_column.rs | 2 +-
.../src/dataframe/series/masks/is_not_null.rs | 3 +-
.../src/dataframe/series/masks/is_null.rs | 3 +-
.../src/dataframe/series/n_unique.rs | 3 +-
.../src/dataframe/series/shift.rs | 2 +-
.../src/dataframe/series/unique.rs | 2 +-
.../src/dataframe/values/mod.rs | 6 +-
.../src/dataframe/values/nu_dataframe/mod.rs | 2 +-
.../src/dataframe/values/nu_lazyframe/mod.rs | 2 +-
src/main.rs | 29 +-
tests/plugins/stream.rs | 21 +-
tests/shell/pipeline/commands/internal.rs | 4 +-
210 files changed, 3955 insertions(+), 4012 deletions(-)
create mode 100644 crates/nu-protocol/src/pipeline/byte_stream.rs
rename crates/nu-protocol/src/{pipeline_data => pipeline}/list_stream.rs (100%)
rename crates/nu-protocol/src/{pipeline_data => pipeline}/metadata.rs (100%)
create mode 100644 crates/nu-protocol/src/pipeline/mod.rs
rename crates/nu-protocol/src/{pipeline_data => pipeline}/out_dest.rs (81%)
create mode 100644 crates/nu-protocol/src/pipeline/pipeline_data.rs
delete mode 100644 crates/nu-protocol/src/pipeline_data/mod.rs
delete mode 100644 crates/nu-protocol/src/pipeline_data/raw_stream.rs
create mode 100644 crates/nu-protocol/src/process/child.rs
create mode 100644 crates/nu-protocol/src/process/exit_status.rs
create mode 100644 crates/nu-protocol/src/process/mod.rs
delete mode 100644 crates/nu-protocol/src/util.rs
rename crates/nu_plugin_example/src/commands/{collect_external.rs => collect_bytes.rs} (56%)
diff --git a/Cargo.lock b/Cargo.lock
index 656f859a63..5a9b95cebd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3254,6 +3254,7 @@ dependencies = [
"indexmap",
"lru",
"miette",
+ "nix",
"nu-path",
"nu-system",
"nu-test-support",
diff --git a/crates/nu-cli/src/completions/completer.rs b/crates/nu-cli/src/completions/completer.rs
index 348111f009..007a0e288a 100644
--- a/crates/nu-cli/src/completions/completer.rs
+++ b/crates/nu-cli/src/completions/completer.rs
@@ -103,9 +103,8 @@ impl NuCompleter {
PipelineData::empty(),
);
- match result {
- Ok(pd) => {
- let value = pd.into_value(span);
+ match result.and_then(|data| data.into_value(span)) {
+ Ok(value) => {
if let Value::List { vals, .. } = value {
let result =
map_value_completions(vals.iter(), Span::new(span.start, span.end), offset);
diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs
index d2ccd5191d..17c8e6a924 100644
--- a/crates/nu-cli/src/completions/custom_completions.rs
+++ b/crates/nu-cli/src/completions/custom_completions.rs
@@ -74,55 +74,53 @@ impl Completer for CustomCompletion {
// Parse result
let suggestions = result
- .map(|pd| {
- let value = pd.into_value(span);
- match &value {
- Value::Record { val, .. } => {
- let completions = val
- .get("completions")
- .and_then(|val| {
- val.as_list()
- .ok()
- .map(|it| map_value_completions(it.iter(), span, offset))
- })
- .unwrap_or_default();
- let options = val.get("options");
+ .and_then(|data| data.into_value(span))
+ .map(|value| match &value {
+ Value::Record { val, .. } => {
+ let completions = val
+ .get("completions")
+ .and_then(|val| {
+ val.as_list()
+ .ok()
+ .map(|it| map_value_completions(it.iter(), span, offset))
+ })
+ .unwrap_or_default();
+ let options = val.get("options");
- if let Some(Value::Record { val: options, .. }) = &options {
- let should_sort = options
- .get("sort")
- .and_then(|val| val.as_bool().ok())
- .unwrap_or(false);
+ if let Some(Value::Record { val: options, .. }) = &options {
+ let should_sort = options
+ .get("sort")
+ .and_then(|val| val.as_bool().ok())
+ .unwrap_or(false);
- if should_sort {
- self.sort_by = SortBy::Ascending;
- }
-
- custom_completion_options = Some(CompletionOptions {
- case_sensitive: options
- .get("case_sensitive")
- .and_then(|val| val.as_bool().ok())
- .unwrap_or(true),
- positional: options
- .get("positional")
- .and_then(|val| val.as_bool().ok())
- .unwrap_or(true),
- match_algorithm: match options.get("completion_algorithm") {
- Some(option) => option
- .coerce_string()
- .ok()
- .and_then(|option| option.try_into().ok())
- .unwrap_or(MatchAlgorithm::Prefix),
- None => completion_options.match_algorithm,
- },
- });
+ if should_sort {
+ self.sort_by = SortBy::Ascending;
}
- completions
+ custom_completion_options = Some(CompletionOptions {
+ case_sensitive: options
+ .get("case_sensitive")
+ .and_then(|val| val.as_bool().ok())
+ .unwrap_or(true),
+ positional: options
+ .get("positional")
+ .and_then(|val| val.as_bool().ok())
+ .unwrap_or(true),
+ match_algorithm: match options.get("completion_algorithm") {
+ Some(option) => option
+ .coerce_string()
+ .ok()
+ .and_then(|option| option.try_into().ok())
+ .unwrap_or(MatchAlgorithm::Prefix),
+ None => completion_options.match_algorithm,
+ },
+ });
}
- Value::List { vals, .. } => map_value_completions(vals.iter(), span, offset),
- _ => vec![],
+
+ completions
}
+ Value::List { vals, .. } => map_value_completions(vals.iter(), span, offset),
+ _ => vec![],
})
.unwrap_or_default();
diff --git a/crates/nu-cli/src/config_files.rs b/crates/nu-cli/src/config_files.rs
index e89fa6c1d1..ec7ad2f412 100644
--- a/crates/nu-cli/src/config_files.rs
+++ b/crates/nu-cli/src/config_files.rs
@@ -306,14 +306,15 @@ pub fn migrate_old_plugin_file(engine_state: &EngineState, storage_path: &str) -
let mut engine_state = engine_state.clone();
let mut stack = Stack::new();
- if !eval_source(
+ if eval_source(
&mut engine_state,
&mut stack,
&old_contents,
&old_plugin_file_path.to_string_lossy(),
PipelineData::Empty,
false,
- ) {
+ ) != 0
+ {
return false;
}
diff --git a/crates/nu-cli/src/eval_cmds.rs b/crates/nu-cli/src/eval_cmds.rs
index 0b0b5f8ddf..8fa3bf30e5 100644
--- a/crates/nu-cli/src/eval_cmds.rs
+++ b/crates/nu-cli/src/eval_cmds.rs
@@ -1,5 +1,4 @@
use log::info;
-use miette::Result;
use nu_engine::{convert_env_values, eval_block};
use nu_parser::parse;
use nu_protocol::{
@@ -59,9 +58,10 @@ pub fn evaluate_commands(
t_mode.coerce_str()?.parse().unwrap_or_default();
}
- let exit_code = pipeline.print(engine_state, stack, no_newline, false)?;
- if exit_code != 0 {
- std::process::exit(exit_code as i32);
+ if let Some(status) = pipeline.print(engine_state, stack, no_newline, false)? {
+ if status.code() != 0 {
+ std::process::exit(status.code())
+ }
}
info!("evaluate {}:{}:{}", file!(), line!(), column!());
diff --git a/crates/nu-cli/src/eval_file.rs b/crates/nu-cli/src/eval_file.rs
index 7483c6bc33..ff6ba36fe3 100644
--- a/crates/nu-cli/src/eval_file.rs
+++ b/crates/nu-cli/src/eval_file.rs
@@ -96,7 +96,7 @@ pub fn evaluate_file(
engine_state.merge_delta(working_set.delta)?;
// Check if the file contains a main command.
- if engine_state.find_decl(b"main", &[]).is_some() {
+ let exit_code = if engine_state.find_decl(b"main", &[]).is_some() {
// Evaluate the file, but don't run main yet.
let pipeline =
match eval_block::(engine_state, stack, &block, PipelineData::empty()) {
@@ -109,26 +109,29 @@ pub fn evaluate_file(
};
// Print the pipeline output of the last command of the file.
- let exit_code = pipeline.print(engine_state, stack, true, false)?;
- if exit_code != 0 {
- std::process::exit(exit_code as i32);
+ if let Some(status) = pipeline.print(engine_state, stack, true, false)? {
+ if status.code() != 0 {
+ std::process::exit(status.code())
+ }
}
// Invoke the main command with arguments.
// Arguments with whitespaces are quoted, thus can be safely concatenated by whitespace.
let args = format!("main {}", args.join(" "));
- if !eval_source(
+ eval_source(
engine_state,
stack,
args.as_bytes(),
"",
input,
true,
- ) {
- std::process::exit(1);
- }
- } else if !eval_source(engine_state, stack, &file, file_path_str, input, true) {
- std::process::exit(1);
+ )
+ } else {
+ eval_source(engine_state, stack, &file, file_path_str, input, true)
+ };
+
+ if exit_code != 0 {
+ std::process::exit(exit_code)
}
info!("evaluate {}:{}:{}", file!(), line!(), column!());
diff --git a/crates/nu-cli/src/menus/menu_completions.rs b/crates/nu-cli/src/menus/menu_completions.rs
index fbfc598225..c65f0bd100 100644
--- a/crates/nu-cli/src/menus/menu_completions.rs
+++ b/crates/nu-cli/src/menus/menu_completions.rs
@@ -59,8 +59,7 @@ impl Completer for NuMenuCompleter {
let res = eval_block::(&self.engine_state, &mut self.stack, block, input);
- if let Ok(values) = res {
- let values = values.into_value(self.span);
+ if let Ok(values) = res.and_then(|data| data.into_value(self.span)) {
convert_to_suggestions(values, line, pos, self.only_buffer_difference)
} else {
Vec::new()
diff --git a/crates/nu-cli/src/util.rs b/crates/nu-cli/src/util.rs
index 2f996691c9..7ebea0deb2 100644
--- a/crates/nu-cli/src/util.rs
+++ b/crates/nu-cli/src/util.rs
@@ -4,7 +4,7 @@ use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token,
use nu_protocol::{
debugger::WithoutDebug,
engine::{EngineState, Stack, StateWorkingSet},
- print_if_stream, report_error, report_error_new, PipelineData, ShellError, Span, Value,
+ report_error, report_error_new, PipelineData, ShellError, Span, Value,
};
#[cfg(windows)]
use nu_utils::enable_vt_processing;
@@ -206,9 +206,48 @@ pub fn eval_source(
fname: &str,
input: PipelineData,
allow_return: bool,
-) -> bool {
+) -> i32 {
let start_time = std::time::Instant::now();
+ let exit_code = match evaluate_source(engine_state, stack, source, fname, input, allow_return) {
+ Ok(code) => code.unwrap_or(0),
+ Err(err) => {
+ report_error_new(engine_state, &err);
+ 1
+ }
+ };
+
+ stack.add_env_var(
+ "LAST_EXIT_CODE".to_string(),
+ Value::int(exit_code.into(), Span::unknown()),
+ );
+
+ // reset vt processing, aka ansi because illbehaved externals can break it
+ #[cfg(windows)]
+ {
+ let _ = enable_vt_processing();
+ }
+
+ perf(
+ &format!("eval_source {}", &fname),
+ start_time,
+ file!(),
+ line!(),
+ column!(),
+ engine_state.get_config().use_ansi_coloring,
+ );
+
+ exit_code
+}
+
+fn evaluate_source(
+ engine_state: &mut EngineState,
+ stack: &mut Stack,
+ source: &[u8],
+ fname: &str,
+ input: PipelineData,
+ allow_return: bool,
+) -> Result, ShellError> {
let (block, delta) = {
let mut working_set = StateWorkingSet::new(engine_state);
let output = parse(
@@ -222,97 +261,40 @@ pub fn eval_source(
}
if let Some(err) = working_set.parse_errors.first() {
- set_last_exit_code(stack, 1);
report_error(&working_set, err);
- return false;
+ return Ok(Some(1));
}
(output, working_set.render())
};
- if let Err(err) = engine_state.merge_delta(delta) {
- set_last_exit_code(stack, 1);
- report_error_new(engine_state, &err);
- return false;
- }
+ engine_state.merge_delta(delta)?;
- let b = if allow_return {
+ let pipeline = if allow_return {
eval_block_with_early_return::(engine_state, stack, &block, input)
} else {
eval_block::(engine_state, stack, &block, input)
+ }?;
+
+ let status = if let PipelineData::ByteStream(stream, ..) = pipeline {
+ stream.print(false)?
+ } else {
+ if let Some(hook) = engine_state.get_config().hooks.display_output.clone() {
+ let pipeline = eval_hook(
+ engine_state,
+ stack,
+ Some(pipeline),
+ vec![],
+ &hook,
+ "display_output",
+ )?;
+ pipeline.print(engine_state, stack, false, false)
+ } else {
+ pipeline.print(engine_state, stack, true, false)
+ }?
};
- match b {
- Ok(pipeline_data) => {
- let config = engine_state.get_config();
- let result;
- if let PipelineData::ExternalStream {
- stdout: stream,
- stderr: stderr_stream,
- exit_code,
- ..
- } = pipeline_data
- {
- result = print_if_stream(stream, stderr_stream, false, exit_code);
- } else if let Some(hook) = config.hooks.display_output.clone() {
- match eval_hook(
- engine_state,
- stack,
- Some(pipeline_data),
- vec![],
- &hook,
- "display_output",
- ) {
- Err(err) => {
- result = Err(err);
- }
- Ok(val) => {
- result = val.print(engine_state, stack, false, false);
- }
- }
- } else {
- result = pipeline_data.print(engine_state, stack, true, false);
- }
-
- match result {
- Err(err) => {
- report_error_new(engine_state, &err);
- return false;
- }
- Ok(exit_code) => {
- set_last_exit_code(stack, exit_code);
- }
- }
-
- // reset vt processing, aka ansi because illbehaved externals can break it
- #[cfg(windows)]
- {
- let _ = enable_vt_processing();
- }
- }
- Err(err) => {
- set_last_exit_code(stack, 1);
- report_error_new(engine_state, &err);
- return false;
- }
- }
- perf(
- &format!("eval_source {}", &fname),
- start_time,
- file!(),
- line!(),
- column!(),
- engine_state.get_config().use_ansi_coloring,
- );
-
- true
-}
-
-fn set_last_exit_code(stack: &mut Stack, exit_code: i64) {
- stack.add_env_var(
- "LAST_EXIT_CODE".to_string(),
- Value::int(exit_code, Span::unknown()),
- );
+ Ok(status.map(|status| status.code()))
}
#[cfg(test)]
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/cast.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/cast.rs
index c170f8db8a..be9c33a229 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/cast.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/eager/cast.rs
@@ -79,7 +79,7 @@ impl Command for CastDF {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuLazyFrame::can_downcast(&value) {
let (dtype, column_nm) = df_args(engine_state, stack, call)?;
let df = NuLazyFrame::try_from_value(value)?;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs
index 3793945181..e0e94d10a0 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/eager/filter_with.rs
@@ -72,8 +72,7 @@ impl Command for FilterWith {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
-
+ let value = input.into_value(call.head)?;
if NuLazyFrame::can_downcast(&value) {
let df = NuLazyFrame::try_from_value(value)?;
command_lazy(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/first.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/first.rs
index 70160b3005..14c86e8c40 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/first.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/eager/first.rs
@@ -86,7 +86,7 @@ impl Command for FirstDF {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuDataFrame::can_downcast(&value) {
let df = NuDataFrame::try_from_value(value)?;
command(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/last.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/last.rs
index a0a188471d..ff2c4f98a2 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/last.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/eager/last.rs
@@ -61,7 +61,7 @@ impl Command for LastDF {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuDataFrame::can_downcast(&value) {
let df = NuDataFrame::try_from_value(value)?;
command(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs
index 5167a0c968..0cb75f34f2 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/eager/rename.rs
@@ -109,8 +109,7 @@ impl Command for RenameDF {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
-
+ let value = input.into_value(call.head)?;
if NuLazyFrame::can_downcast(&value) {
let df = NuLazyFrame::try_from_value(value)?;
command_lazy(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/to_nu.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/to_nu.rs
index 73dadacb2b..a6ab42052c 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/to_nu.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/eager/to_nu.rs
@@ -76,7 +76,7 @@ impl Command for ToNu {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuDataFrame::can_downcast(&value) {
dataframe_command(engine_state, stack, call, value)
} else {
diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs
index 52ceefceb4..79d3427e8a 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/eager/with_column.rs
@@ -102,8 +102,7 @@ impl Command for WithColumn {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
-
+ let value = input.into_value(call.head)?;
if NuLazyFrame::can_downcast(&value) {
let df = NuLazyFrame::try_from_value(value)?;
command_lazy(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/expressions_macro.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/expressions_macro.rs
index b2d79be010..4cc56e030b 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/expressions_macro.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/expressions/expressions_macro.rs
@@ -172,7 +172,7 @@ macro_rules! lazy_expr_command {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuDataFrame::can_downcast(&value) {
let lazy = NuLazyFrame::try_from_value(value)?;
let lazy = NuLazyFrame::new(
@@ -271,7 +271,7 @@ macro_rules! lazy_expr_command {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuDataFrame::can_downcast(&value) {
let lazy = NuLazyFrame::try_from_value(value)?;
let lazy = NuLazyFrame::new(
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/otherwise.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/otherwise.rs
index 0ba507f97f..eb97c575b7 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/otherwise.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/expressions/otherwise.rs
@@ -91,7 +91,7 @@ impl Command for ExprOtherwise {
let otherwise_predicate: Value = call.req(engine_state, stack, 0)?;
let otherwise_predicate = NuExpression::try_from_value(otherwise_predicate)?;
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
let complete: NuExpression = match NuWhen::try_from_value(value)? {
NuWhen::Then(then) => then.otherwise(otherwise_predicate.into_polars()).into(),
NuWhen::ChainedThen(chained_when) => chained_when
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/quantile.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/quantile.rs
index d82a0faf0a..aaa1029ee9 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/quantile.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/expressions/quantile.rs
@@ -67,7 +67,7 @@ impl Command for ExprQuantile {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
let quantile: f64 = call.req(engine_state, stack, 0)?;
let expr = NuExpression::try_from_value(value)?;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/expressions/when.rs b/crates/nu-cmd-dataframe/src/dataframe/expressions/when.rs
index d70fd00825..5a6aad2de7 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/expressions/when.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/expressions/when.rs
@@ -103,7 +103,7 @@ impl Command for ExprWhen {
let then_predicate: Value = call.req(engine_state, stack, 1)?;
let then_predicate = NuExpression::try_from_value(then_predicate)?;
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
let when_then: NuWhen = match value {
Value::Nothing { .. } => when(when_predicate.into_polars())
.then(then_predicate.into_polars())
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/explode.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/explode.rs
index 8e32ae8040..a027e84d36 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/explode.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/lazy/explode.rs
@@ -100,7 +100,7 @@ impl Command for LazyExplode {
}
pub(crate) fn explode(call: &Call, input: PipelineData) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuDataFrame::can_downcast(&value) {
let df = NuLazyFrame::try_from_value(value)?;
let columns: Vec = call
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs
index a9a1eb1590..4c75f1d9a3 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_nan.rs
@@ -82,7 +82,7 @@ impl Command for LazyFillNA {
input: PipelineData,
) -> Result {
let fill: Value = call.req(engine_state, stack, 0)?;
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuExpression::can_downcast(&value) {
let expr = NuExpression::try_from_value(value)?;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_null.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_null.rs
index b3d35d2b8d..88be2a9e88 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_null.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/lazy/fill_null.rs
@@ -59,7 +59,7 @@ impl Command for LazyFillNull {
input: PipelineData,
) -> Result {
let fill: Value = call.req(engine_state, stack, 0)?;
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuExpression::can_downcast(&value) {
let expr = NuExpression::try_from_value(value)?;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs
index 7f7d1ab66b..4ae297acfd 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/lazy/join.rs
@@ -219,7 +219,7 @@ impl Command for LazyJoin {
let suffix: Option = call.get_flag(engine_state, stack, "suffix")?;
let suffix = suffix.unwrap_or_else(|| "_x".into());
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
let lazy = NuLazyFrame::try_from_value(value)?;
let from_eager = lazy.from_eager;
let lazy = lazy.into_polars();
diff --git a/crates/nu-cmd-dataframe/src/dataframe/lazy/quantile.rs b/crates/nu-cmd-dataframe/src/dataframe/lazy/quantile.rs
index d17a444f49..ac8ec590c6 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/lazy/quantile.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/lazy/quantile.rs
@@ -54,7 +54,7 @@ impl Command for LazyQuantile {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
let quantile: f64 = call.req(engine_state, stack, 0)?;
let lazy = NuLazyFrame::try_from_value(value)?;
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_not_null.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_not_null.rs
index ce66f69877..4ed33ce951 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_not_null.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_not_null.rs
@@ -68,7 +68,7 @@ impl Command for IsNotNull {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuDataFrame::can_downcast(&value) {
let df = NuDataFrame::try_from_value(value)?;
command(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_null.rs b/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_null.rs
index d7921da347..b99d48af66 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_null.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/series/masks/is_null.rs
@@ -68,7 +68,7 @@ impl Command for IsNull {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuDataFrame::can_downcast(&value) {
let df = NuDataFrame::try_from_value(value)?;
command(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/n_unique.rs b/crates/nu-cmd-dataframe/src/dataframe/series/n_unique.rs
index b23ab4e20d..c6d6e829f8 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/series/n_unique.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/series/n_unique.rs
@@ -60,7 +60,7 @@ impl Command for NUnique {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
if NuDataFrame::can_downcast(&value) {
let df = NuDataFrame::try_from_value(value)?;
command(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/shift.rs b/crates/nu-cmd-dataframe/src/dataframe/series/shift.rs
index bf842840b4..2f40cf0a45 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/series/shift.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/series/shift.rs
@@ -56,8 +56,7 @@ impl Command for Shift {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
-
+ let value = input.into_value(call.head)?;
if NuLazyFrame::can_downcast(&value) {
let df = NuLazyFrame::try_from_value(value)?;
command_lazy(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/series/unique.rs b/crates/nu-cmd-dataframe/src/dataframe/series/unique.rs
index 13012b4fb3..1bc2e0dc1b 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/series/unique.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/series/unique.rs
@@ -72,8 +72,7 @@ impl Command for Unique {
call: &Call,
input: PipelineData,
) -> Result {
- let value = input.into_value(call.head);
-
+ let value = input.into_value(call.head)?;
if NuLazyFrame::can_downcast(&value) {
let df = NuLazyFrame::try_from_value(value)?;
command_lazy(engine_state, stack, call, df)
diff --git a/crates/nu-cmd-dataframe/src/dataframe/test_dataframe.rs b/crates/nu-cmd-dataframe/src/dataframe/test_dataframe.rs
index d6febf7e43..39c30be9dd 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/test_dataframe.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/test_dataframe.rs
@@ -80,7 +80,8 @@ pub fn test_dataframe_example(engine_state: &mut Box, example: &Exa
let result =
eval_block::(engine_state, &mut stack, &block, PipelineData::empty())
.unwrap_or_else(|err| panic!("test eval error in `{}`: {:?}", example.example, err))
- .into_value(Span::test_data());
+ .into_value(Span::test_data())
+ .expect("ok value");
println!("input: {}", example.example);
println!("result: {result:?}");
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/mod.rs
index 8b828aee50..967e03580f 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/mod.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/values/nu_dataframe/mod.rs
@@ -297,7 +297,7 @@ impl NuDataFrame {
}
pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result {
- let value = input.into_value(span);
+ let value = input.into_value(span)?;
Self::try_from_value(value)
}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/mod.rs
index 8646cdefd0..cee31d7b53 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/mod.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/values/nu_expression/mod.rs
@@ -84,7 +84,7 @@ impl NuExpression {
}
pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result {
- let value = input.into_value(span);
+ let value = input.into_value(span)?;
Self::try_from_value(value)
}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/mod.rs
index f03d9f0cc8..355516d340 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/mod.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazyframe/mod.rs
@@ -134,7 +134,7 @@ impl NuLazyFrame {
}
pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result {
- let value = input.into_value(span);
+ let value = input.into_value(span)?;
Self::try_from_value(value)
}
diff --git a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/mod.rs b/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/mod.rs
index e942e3be97..e1bcb30069 100644
--- a/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/mod.rs
+++ b/crates/nu-cmd-dataframe/src/dataframe/values/nu_lazygroupby/mod.rs
@@ -107,7 +107,7 @@ impl NuLazyGroupBy {
}
pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result {
- let value = input.into_value(span);
+ let value = input.into_value(span)?;
Self::try_from_value(value)
}
}
diff --git a/crates/nu-cmd-extra/src/extra/bits/into.rs b/crates/nu-cmd-extra/src/extra/bits/into.rs
index c7fd09b728..cf85f92ac5 100644
--- a/crates/nu-cmd-extra/src/extra/bits/into.rs
+++ b/crates/nu-cmd-extra/src/extra/bits/into.rs
@@ -118,22 +118,12 @@ fn into_bits(
let cell_paths = call.rest(engine_state, stack, 0)?;
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
- match input {
- PipelineData::ExternalStream { stdout: None, .. } => {
- Ok(Value::binary(vec![], head).into_pipeline_data())
- }
- PipelineData::ExternalStream {
- stdout: Some(stream),
- ..
- } => {
- // TODO: in the future, we may want this to stream out, converting each to bytes
- let output = stream.into_bytes()?;
- Ok(Value::binary(output.item, head).into_pipeline_data())
- }
- _ => {
- let args = Arguments { cell_paths };
- operate(action, args, input, call.head, engine_state.ctrlc.clone())
- }
+ if let PipelineData::ByteStream(stream, ..) = input {
+ // TODO: in the future, we may want this to stream out, converting each to bytes
+ Ok(Value::binary(stream.into_bytes()?, head).into_pipeline_data())
+ } else {
+ let args = Arguments { cell_paths };
+ operate(action, args, input, call.head, engine_state.ctrlc.clone())
}
}
diff --git a/crates/nu-cmd-extra/src/extra/filters/each_while.rs b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
index 939f194f43..58679c8eea 100644
--- a/crates/nu-cmd-extra/src/extra/filters/each_while.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/each_while.rs
@@ -78,38 +78,40 @@ impl Command for EachWhile {
| PipelineData::ListStream(..) => {
let mut closure = ClosureEval::new(engine_state, stack, closure);
Ok(input
- .into_iter()
- .map_while(move |value| match closure.run_with_value(value) {
- Ok(data) => {
- let value = data.into_value(head);
- (!value.is_nothing()).then_some(value)
- }
- Err(_) => None,
- })
- .fuse()
- .into_pipeline_data(head, engine_state.ctrlc.clone()))
- }
- PipelineData::ExternalStream { stdout: None, .. } => Ok(PipelineData::empty()),
- PipelineData::ExternalStream {
- stdout: Some(stream),
- ..
- } => {
- let mut closure = ClosureEval::new(engine_state, stack, closure);
- Ok(stream
.into_iter()
.map_while(move |value| {
- let value = value.ok()?;
- match closure.run_with_value(value) {
- Ok(data) => {
- let value = data.into_value(head);
- (!value.is_nothing()).then_some(value)
- }
+ match closure
+ .run_with_value(value)
+ .and_then(|data| data.into_value(head))
+ {
+ Ok(value) => (!value.is_nothing()).then_some(value),
Err(_) => None,
}
})
.fuse()
.into_pipeline_data(head, engine_state.ctrlc.clone()))
}
+ PipelineData::ByteStream(stream, ..) => {
+ let span = stream.span();
+ if let Some(chunks) = stream.chunks() {
+ let mut closure = ClosureEval::new(engine_state, stack, closure);
+ Ok(chunks
+ .map_while(move |value| {
+ let value = value.ok()?;
+ match closure
+ .run_with_value(value)
+ .and_then(|data| data.into_value(span))
+ {
+ Ok(value) => (!value.is_nothing()).then_some(value),
+ Err(_) => None,
+ }
+ })
+ .fuse()
+ .into_pipeline_data(head, engine_state.ctrlc.clone()))
+ } else {
+ Ok(PipelineData::Empty)
+ }
+ }
// This match allows non-iterables to be accepted,
// which is currently considered undesirable (Nov 2022).
PipelineData::Value(value, ..) => {
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_down.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_down.rs
index 465b9f1f4c..24ea1bc309 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_down.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_down.rs
@@ -56,7 +56,7 @@ impl Command for RollDown {
let by: Option = call.get_flag(engine_state, stack, "by")?;
let metadata = input.metadata();
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
let rotated_value = vertical_rotate_value(value, by, VerticalDirection::Down)?;
Ok(rotated_value.into_pipeline_data().set_metadata(metadata))
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_left.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_left.rs
index ff69f23268..789b70830d 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_left.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_left.rs
@@ -94,7 +94,7 @@ impl Command for RollLeft {
let metadata = input.metadata();
let cells_only = call.has_flag(engine_state, stack, "cells-only")?;
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
let rotated_value =
horizontal_rotate_value(value, by, cells_only, &HorizontalDirection::Left)?;
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_right.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_right.rs
index d190960581..55a1e42158 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_right.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_right.rs
@@ -94,7 +94,7 @@ impl Command for RollRight {
let metadata = input.metadata();
let cells_only = call.has_flag(engine_state, stack, "cells-only")?;
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
let rotated_value =
horizontal_rotate_value(value, by, cells_only, &HorizontalDirection::Right)?;
diff --git a/crates/nu-cmd-extra/src/extra/filters/roll/roll_up.rs b/crates/nu-cmd-extra/src/extra/filters/roll/roll_up.rs
index 1cd74fe247..7b9480599d 100644
--- a/crates/nu-cmd-extra/src/extra/filters/roll/roll_up.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/roll/roll_up.rs
@@ -56,7 +56,7 @@ impl Command for RollUp {
let by: Option = call.get_flag(engine_state, stack, "by")?;
let metadata = input.metadata();
- let value = input.into_value(call.head);
+ let value = input.into_value(call.head)?;
let rotated_value = vertical_rotate_value(value, by, VerticalDirection::Up)?;
Ok(rotated_value.into_pipeline_data().set_metadata(metadata))
diff --git a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
index 9fe9bfe389..c90e933410 100644
--- a/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
+++ b/crates/nu-cmd-extra/src/extra/filters/update_cells.rs
@@ -152,7 +152,7 @@ impl Iterator for UpdateCellIterator {
fn eval_value(closure: &mut ClosureEval, span: Span, value: Value) -> Value {
closure
.run_with_value(value)
- .map(|data| data.into_value(span))
+ .and_then(|data| data.into_value(span))
.unwrap_or_else(|err| Value::error(err, span))
}
diff --git a/crates/nu-cmd-extra/src/extra/strings/format/command.rs b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
index 932b5ccb7f..1c72627779 100644
--- a/crates/nu-cmd-extra/src/extra/strings/format/command.rs
+++ b/crates/nu-cmd-extra/src/extra/strings/format/command.rs
@@ -39,7 +39,7 @@ impl Command for FormatPattern {
let mut working_set = StateWorkingSet::new(engine_state);
let specified_pattern: Result = call.req(engine_state, stack, 0);
- let input_val = input.into_value(call.head);
+ let input_val = input.into_value(call.head)?;
// add '$it' variable to support format like this: $it.column1.column2.
let it_id = working_set.add_variable(b"$it".to_vec(), call.head, Type::Any, false);
stack.add_var(it_id, input_val.clone());
diff --git a/crates/nu-cmd-extra/tests/commands/bytes/starts_with.rs b/crates/nu-cmd-extra/tests/commands/bytes/starts_with.rs
index e7d57698b5..c3ad1ec448 100644
--- a/crates/nu-cmd-extra/tests/commands/bytes/starts_with.rs
+++ b/crates/nu-cmd-extra/tests/commands/bytes/starts_with.rs
@@ -19,102 +19,102 @@ fn basic_string_fails() {
assert_eq!(actual.out, "");
}
-#[test]
-fn short_stream_binary() {
- let actual = nu!(r#"
- nu --testbin repeater (0x[01]) 5 | bytes starts-with 0x[010101]
- "#);
+// #[test]
+// fn short_stream_binary() {
+// let actual = nu!(r#"
+// nu --testbin repeater (0x[01]) 5 | bytes starts-with 0x[010101]
+// "#);
- assert_eq!(actual.out, "true");
-}
+// assert_eq!(actual.out, "true");
+// }
-#[test]
-fn short_stream_mismatch() {
- let actual = nu!(r#"
- nu --testbin repeater (0x[010203]) 5 | bytes starts-with 0x[010204]
- "#);
+// #[test]
+// fn short_stream_mismatch() {
+// let actual = nu!(r#"
+// nu --testbin repeater (0x[010203]) 5 | bytes starts-with 0x[010204]
+// "#);
- assert_eq!(actual.out, "false");
-}
+// assert_eq!(actual.out, "false");
+// }
-#[test]
-fn short_stream_binary_overflow() {
- let actual = nu!(r#"
- nu --testbin repeater (0x[01]) 5 | bytes starts-with 0x[010101010101]
- "#);
+// #[test]
+// fn short_stream_binary_overflow() {
+// let actual = nu!(r#"
+// nu --testbin repeater (0x[01]) 5 | bytes starts-with 0x[010101010101]
+// "#);
- assert_eq!(actual.out, "false");
-}
+// assert_eq!(actual.out, "false");
+// }
-#[test]
-fn long_stream_binary() {
- let actual = nu!(r#"
- nu --testbin repeater (0x[01]) 32768 | bytes starts-with 0x[010101]
- "#);
+// #[test]
+// fn long_stream_binary() {
+// let actual = nu!(r#"
+// nu --testbin repeater (0x[01]) 32768 | bytes starts-with 0x[010101]
+// "#);
- assert_eq!(actual.out, "true");
-}
+// assert_eq!(actual.out, "true");
+// }
-#[test]
-fn long_stream_binary_overflow() {
- // .. ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
- let actual = nu!(r#"
- nu --testbin repeater (0x[01]) 32768 | bytes starts-with (0..32768 | each {|| 0x[01] } | bytes collect)
- "#);
+// #[test]
+// fn long_stream_binary_overflow() {
+// // .. ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+// let actual = nu!(r#"
+// nu --testbin repeater (0x[01]) 32768 | bytes starts-with (0..32768 | each {|| 0x[01] } | bytes collect)
+// "#);
- assert_eq!(actual.out, "false");
-}
+// assert_eq!(actual.out, "false");
+// }
-#[test]
-fn long_stream_binary_exact() {
- // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
- let actual = nu!(r#"
- nu --testbin repeater (0x[01020304]) 8192 | bytes starts-with (0..<8192 | each {|| 0x[01020304] } | bytes collect)
- "#);
+// #[test]
+// fn long_stream_binary_exact() {
+// // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+// let actual = nu!(r#"
+// nu --testbin repeater (0x[01020304]) 8192 | bytes starts-with (0..<8192 | each {|| 0x[01020304] } | bytes collect)
+// "#);
- assert_eq!(actual.out, "true");
-}
+// assert_eq!(actual.out, "true");
+// }
-#[test]
-fn long_stream_string_exact() {
- // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
- let actual = nu!(r#"
- nu --testbin repeater hell 8192 | bytes starts-with (0..<8192 | each {|| "hell" | into binary } | bytes collect)
- "#);
+// #[test]
+// fn long_stream_string_exact() {
+// // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+// let actual = nu!(r#"
+// nu --testbin repeater hell 8192 | bytes starts-with (0..<8192 | each {|| "hell" | into binary } | bytes collect)
+// "#);
- assert_eq!(actual.out, "true");
-}
+// assert_eq!(actual.out, "true");
+// }
-#[test]
-fn long_stream_mixed_exact() {
- // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
- let actual = nu!(r#"
- let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
- let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
+// #[test]
+// fn long_stream_mixed_exact() {
+// // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+// let actual = nu!(r#"
+// let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
+// let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
- nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes starts-with (bytes build $binseg $strseg)
- "#);
+// nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes starts-with (bytes build $binseg $strseg)
+// "#);
- assert_eq!(
- actual.err, "",
- "invocation failed. command line limit likely reached"
- );
- assert_eq!(actual.out, "true");
-}
+// assert_eq!(
+// actual.err, "",
+// "invocation failed. command line limit likely reached"
+// );
+// assert_eq!(actual.out, "true");
+// }
-#[test]
-fn long_stream_mixed_overflow() {
- // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
- let actual = nu!(r#"
- let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
- let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
+// #[test]
+// fn long_stream_mixed_overflow() {
+// // ranges are inclusive..inclusive, so we don't need to +1 to check for an overflow
+// let actual = nu!(r#"
+// let binseg = (0..<2048 | each {|| 0x[003d9fbf] } | bytes collect)
+// let strseg = (0..<2048 | each {|| "hell" | into binary } | bytes collect)
- nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes starts-with (bytes build $binseg $strseg 0x[01])
- "#);
+// nu --testbin repeat_bytes 003d9fbf 2048 68656c6c 2048 | bytes starts-with (bytes build $binseg $strseg 0x[01])
+// "#);
- assert_eq!(
- actual.err, "",
- "invocation failed. command line limit likely reached"
- );
- assert_eq!(actual.out, "false");
-}
+// assert_eq!(
+// actual.err, "",
+// "invocation failed. command line limit likely reached"
+// );
+// assert_eq!(actual.out, "false");
+// }
diff --git a/crates/nu-cmd-lang/src/core_commands/collect.rs b/crates/nu-cmd-lang/src/core_commands/collect.rs
index eae41e8690..404aa568da 100644
--- a/crates/nu-cmd-lang/src/core_commands/collect.rs
+++ b/crates/nu-cmd-lang/src/core_commands/collect.rs
@@ -43,7 +43,7 @@ impl Command for Collect {
stack.captures_to_stack_preserve_out_dest(closure.captures.clone());
let metadata = input.metadata();
- let input = input.into_value(call.head);
+ let input = input.into_value(call.head)?;
let mut saved_positional = None;
if let Some(var) = block.signature.get_positional(0) {
diff --git a/crates/nu-cmd-lang/src/core_commands/describe.rs b/crates/nu-cmd-lang/src/core_commands/describe.rs
index e1934f8bad..7d6d7f6f83 100644
--- a/crates/nu-cmd-lang/src/core_commands/describe.rs
+++ b/crates/nu-cmd-lang/src/core_commands/describe.rs
@@ -1,5 +1,5 @@
use nu_engine::command_prelude::*;
-use nu_protocol::{engine::StateWorkingSet, PipelineMetadata};
+use nu_protocol::{engine::StateWorkingSet, ByteStreamSource, PipelineMetadata};
#[derive(Clone)]
pub struct Describe;
@@ -162,73 +162,38 @@ fn run(
let metadata = input.metadata();
let description = match input {
- PipelineData::ExternalStream {
- ref stdout,
- ref stderr,
- ref exit_code,
- ..
- } => {
- if options.detailed {
- let stdout = if stdout.is_some() {
- Value::record(
- record! {
- "type" => Value::string("stream", head),
- "origin" => Value::string("external", head),
- "subtype" => Value::string("any", head),
- },
- head,
- )
- } else {
- Value::nothing(head)
- };
-
- let stderr = if stderr.is_some() {
- Value::record(
- record! {
- "type" => Value::string("stream", head),
- "origin" => Value::string("external", head),
- "subtype" => Value::string("any", head),
- },
- head,
- )
- } else {
- Value::nothing(head)
- };
-
- let exit_code = if exit_code.is_some() {
- Value::record(
- record! {
- "type" => Value::string("stream", head),
- "origin" => Value::string("external", head),
- "subtype" => Value::string("int", head),
- },
- head,
- )
- } else {
- Value::nothing(head)
+ PipelineData::ByteStream(stream, ..) => {
+ let description = if options.detailed {
+ let origin = match stream.source() {
+ ByteStreamSource::Read(_) => "unknown",
+ ByteStreamSource::File(_) => "file",
+ ByteStreamSource::Child(_) => "external",
};
Value::record(
record! {
- "type" => Value::string("stream", head),
- "origin" => Value::string("external", head),
- "stdout" => stdout,
- "stderr" => stderr,
- "exit_code" => exit_code,
+ "type" => Value::string("byte stream", head),
+ "origin" => Value::string(origin, head),
"metadata" => metadata_to_value(metadata, head),
},
head,
)
} else {
- Value::string("raw input", head)
+ Value::string("byte stream", head)
+ };
+
+ if !options.no_collect {
+ stream.drain()?;
}
+
+ description
}
- PipelineData::ListStream(_, _) => {
+ PipelineData::ListStream(stream, ..) => {
if options.detailed {
let subtype = if options.no_collect {
Value::string("any", head)
} else {
- describe_value(input.into_value(head), head, engine_state)
+ describe_value(stream.into_value(), head, engine_state)
};
Value::record(
record! {
@@ -242,19 +207,19 @@ fn run(
} else if options.no_collect {
Value::string("stream", head)
} else {
- let value = input.into_value(head);
+ let value = stream.into_value();
let base_description = value.get_type().to_string();
Value::string(format!("{} (stream)", base_description), head)
}
}
- _ => {
- let value = input.into_value(head);
+ PipelineData::Value(value, ..) => {
if !options.detailed {
Value::string(value.get_type().to_string(), head)
} else {
describe_value(value, head, engine_state)
}
}
+ PipelineData::Empty => Value::string(Type::Nothing.to_string(), head),
};
Ok(description.into_pipeline_data())
diff --git a/crates/nu-cmd-lang/src/core_commands/do_.rs b/crates/nu-cmd-lang/src/core_commands/do_.rs
index b057880cf3..5f14e88c07 100644
--- a/crates/nu-cmd-lang/src/core_commands/do_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/do_.rs
@@ -1,6 +1,13 @@
use nu_engine::{command_prelude::*, get_eval_block_with_early_return, redirect_env};
-use nu_protocol::{engine::Closure, ListStream, OutDest, RawStream};
-use std::thread;
+use nu_protocol::{
+ engine::Closure,
+ process::{ChildPipe, ChildProcess, ExitStatus},
+ ByteStream, ByteStreamSource, OutDest,
+};
+use std::{
+ io::{Cursor, Read},
+ thread,
+};
#[derive(Clone)]
pub struct Do;
@@ -86,115 +93,91 @@ impl Command for Do {
}
match result {
- Ok(PipelineData::ExternalStream {
- stdout,
- stderr,
- exit_code,
- span,
- metadata,
- trim_end_newline,
- }) if capture_errors => {
- // Use a thread to receive stdout message.
- // Or we may get a deadlock if child process sends out too much bytes to stderr.
- //
- // For example: in normal linux system, stderr pipe's limit is 65535 bytes.
- // if child process sends out 65536 bytes, the process will be hanged because no consumer
- // consumes the first 65535 bytes
- // So we need a thread to receive stdout message, then the current thread can continue to consume
- // stderr messages.
- let stdout_handler = stdout
- .map(|stdout_stream| {
- thread::Builder::new()
- .name("stderr redirector".to_string())
- .spawn(move || {
- let ctrlc = stdout_stream.ctrlc.clone();
- let span = stdout_stream.span;
- RawStream::new(
- Box::new(std::iter::once(
- stdout_stream.into_bytes().map(|s| s.item),
- )),
- ctrlc,
- span,
- None,
- )
+ Ok(PipelineData::ByteStream(stream, metadata)) if capture_errors => {
+ let span = stream.span();
+ match stream.into_child() {
+ Ok(mut child) => {
+ // Use a thread to receive stdout message.
+ // Or we may get a deadlock if child process sends out too much bytes to stderr.
+ //
+ // For example: in normal linux system, stderr pipe's limit is 65535 bytes.
+ // if child process sends out 65536 bytes, the process will be hanged because no consumer
+ // consumes the first 65535 bytes
+ // So we need a thread to receive stdout message, then the current thread can continue to consume
+ // stderr messages.
+ let stdout_handler = child
+ .stdout
+ .take()
+ .map(|mut stdout| {
+ thread::Builder::new()
+ .name("stdout consumer".to_string())
+ .spawn(move || {
+ let mut buf = Vec::new();
+ stdout.read_to_end(&mut buf)?;
+ Ok::<_, ShellError>(buf)
+ })
+ .err_span(head)
})
- .err_span(head)
- })
- .transpose()?;
+ .transpose()?;
- // Intercept stderr so we can return it in the error if the exit code is non-zero.
- // The threading issues mentioned above dictate why we also need to intercept stdout.
- let mut stderr_ctrlc = None;
- let stderr_msg = match stderr {
- None => "".to_string(),
- Some(stderr_stream) => {
- stderr_ctrlc.clone_from(&stderr_stream.ctrlc);
- stderr_stream.into_string().map(|s| s.item)?
- }
- };
+ // Intercept stderr so we can return it in the error if the exit code is non-zero.
+ // The threading issues mentioned above dictate why we also need to intercept stdout.
+ let stderr_msg = match child.stderr.take() {
+ None => String::new(),
+ Some(mut stderr) => {
+ let mut buf = String::new();
+ stderr.read_to_string(&mut buf).err_span(span)?;
+ buf
+ }
+ };
- let stdout = if let Some(handle) = stdout_handler {
- match handle.join() {
- Err(err) => {
+ let stdout = if let Some(handle) = stdout_handler {
+ match handle.join() {
+ Err(err) => {
+ return Err(ShellError::ExternalCommand {
+ label: "Fail to receive external commands stdout message"
+ .to_string(),
+ help: format!("{err:?}"),
+ span,
+ });
+ }
+ Ok(res) => Some(res?),
+ }
+ } else {
+ None
+ };
+
+ if child.wait()? != ExitStatus::Exited(0) {
return Err(ShellError::ExternalCommand {
- label: "Fail to receive external commands stdout message"
- .to_string(),
- help: format!("{err:?}"),
+ label: "External command failed".to_string(),
+ help: stderr_msg,
span,
});
}
- Ok(res) => Some(res),
- }
- } else {
- None
- };
- let exit_code: Vec = match exit_code {
- None => vec![],
- Some(exit_code_stream) => exit_code_stream.into_iter().collect(),
- };
- if let Some(Value::Int { val: code, .. }) = exit_code.last() {
- if *code != 0 {
- return Err(ShellError::ExternalCommand {
- label: "External command failed".to_string(),
- help: stderr_msg,
- span,
- });
+ let mut child = ChildProcess::from_raw(None, None, None, span);
+ if let Some(stdout) = stdout {
+ child.stdout = Some(ChildPipe::Tee(Box::new(Cursor::new(stdout))));
+ }
+ if !stderr_msg.is_empty() {
+ child.stderr = Some(ChildPipe::Tee(Box::new(Cursor::new(stderr_msg))));
+ }
+ Ok(PipelineData::ByteStream(
+ ByteStream::child(child, span),
+ metadata,
+ ))
}
+ Err(stream) => Ok(PipelineData::ByteStream(stream, metadata)),
}
-
- Ok(PipelineData::ExternalStream {
- stdout,
- stderr: Some(RawStream::new(
- Box::new(std::iter::once(Ok(stderr_msg.into_bytes()))),
- stderr_ctrlc,
- span,
- None,
- )),
- exit_code: Some(ListStream::new(exit_code.into_iter(), span, None)),
- span,
- metadata,
- trim_end_newline,
- })
}
- Ok(PipelineData::ExternalStream {
- stdout,
- stderr,
- exit_code: _,
- span,
- metadata,
- trim_end_newline,
- }) if ignore_program_errors
- && !matches!(caller_stack.stdout(), OutDest::Pipe | OutDest::Capture) =>
+ Ok(PipelineData::ByteStream(mut stream, metadata))
+ if ignore_program_errors
+ && !matches!(caller_stack.stdout(), OutDest::Pipe | OutDest::Capture) =>
{
- Ok(PipelineData::ExternalStream {
- stdout,
- stderr,
- exit_code: None,
- span,
- metadata,
- trim_end_newline,
- })
+ if let ByteStreamSource::Child(child) = stream.source_mut() {
+ child.set_exit_code(0)
+ }
+ Ok(PipelineData::ByteStream(stream, metadata))
}
Ok(PipelineData::Value(Value::Error { .. }, ..)) | Err(_) if ignore_shell_errors => {
Ok(PipelineData::empty())
diff --git a/crates/nu-cmd-lang/src/core_commands/for_.rs b/crates/nu-cmd-lang/src/core_commands/for_.rs
index 64e6c0a6ba..6f9391614e 100644
--- a/crates/nu-cmd-lang/src/core_commands/for_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/for_.rs
@@ -121,12 +121,14 @@ impl Command for For {
Err(err) => {
return Err(err);
}
- Ok(pipeline) => {
- let exit_code = pipeline.drain_with_exit_code()?;
- if exit_code != 0 {
- return Ok(PipelineData::new_external_stream_with_only_exit_code(
- exit_code,
- ));
+ Ok(data) => {
+ if let Some(status) = data.drain()? {
+ let code = status.code();
+ if code != 0 {
+ return Ok(
+ PipelineData::new_external_stream_with_only_exit_code(code),
+ );
+ }
}
}
}
@@ -159,12 +161,14 @@ impl Command for For {
Err(err) => {
return Err(err);
}
- Ok(pipeline) => {
- let exit_code = pipeline.drain_with_exit_code()?;
- if exit_code != 0 {
- return Ok(PipelineData::new_external_stream_with_only_exit_code(
- exit_code,
- ));
+ Ok(data) => {
+ if let Some(status) = data.drain()? {
+ let code = status.code();
+ if code != 0 {
+ return Ok(
+ PipelineData::new_external_stream_with_only_exit_code(code),
+ );
+ }
}
}
}
@@ -173,7 +177,7 @@ impl Command for For {
x => {
stack.add_var(var_id, x);
- eval_block(&engine_state, stack, block, PipelineData::empty())?.into_value(head);
+ eval_block(&engine_state, stack, block, PipelineData::empty())?.into_value(head)?;
}
}
Ok(PipelineData::empty())
diff --git a/crates/nu-cmd-lang/src/core_commands/let_.rs b/crates/nu-cmd-lang/src/core_commands/let_.rs
index c780954bc6..cc5504d8d6 100644
--- a/crates/nu-cmd-lang/src/core_commands/let_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/let_.rs
@@ -61,7 +61,7 @@ impl Command for Let {
let eval_block = get_eval_block(engine_state);
let stack = &mut stack.start_capture();
let pipeline_data = eval_block(engine_state, stack, block, input)?;
- let value = pipeline_data.into_value(call.head);
+ let value = pipeline_data.into_value(call.head)?;
// if given variable type is Glob, and our result is string
// then nushell need to convert from Value::String to Value::Glob
diff --git a/crates/nu-cmd-lang/src/core_commands/loop_.rs b/crates/nu-cmd-lang/src/core_commands/loop_.rs
index 29f22649eb..9b1e36a057 100644
--- a/crates/nu-cmd-lang/src/core_commands/loop_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/loop_.rs
@@ -53,12 +53,12 @@ impl Command for Loop {
Err(err) => {
return Err(err);
}
- Ok(pipeline) => {
- let exit_code = pipeline.drain_with_exit_code()?;
- if exit_code != 0 {
- return Ok(PipelineData::new_external_stream_with_only_exit_code(
- exit_code,
- ));
+ Ok(data) => {
+ if let Some(status) = data.drain()? {
+ let code = status.code();
+ if code != 0 {
+ return Ok(PipelineData::new_external_stream_with_only_exit_code(code));
+ }
}
}
}
diff --git a/crates/nu-cmd-lang/src/core_commands/mut_.rs b/crates/nu-cmd-lang/src/core_commands/mut_.rs
index be2d66aff4..60c4c146db 100644
--- a/crates/nu-cmd-lang/src/core_commands/mut_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/mut_.rs
@@ -61,7 +61,7 @@ impl Command for Mut {
let eval_block = get_eval_block(engine_state);
let stack = &mut stack.start_capture();
let pipeline_data = eval_block(engine_state, stack, block, input)?;
- let value = pipeline_data.into_value(call.head);
+ let value = pipeline_data.into_value(call.head)?;
// if given variable type is Glob, and our result is string
// then nushell need to convert from Value::String to Value::Glob
diff --git a/crates/nu-cmd-lang/src/core_commands/try_.rs b/crates/nu-cmd-lang/src/core_commands/try_.rs
index bc96f3c28a..0b399e368a 100644
--- a/crates/nu-cmd-lang/src/core_commands/try_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/try_.rs
@@ -62,10 +62,11 @@ impl Command for Try {
}
// external command may fail to run
Ok(pipeline) => {
- let (pipeline, external_failed) = pipeline.check_external_failed();
+ let (pipeline, external_failed) = pipeline.check_external_failed()?;
if external_failed {
- let exit_code = pipeline.drain_with_exit_code()?;
- stack.add_env_var("LAST_EXIT_CODE".into(), Value::int(exit_code, call.head));
+ let status = pipeline.drain()?;
+ let code = status.map(|status| status.code()).unwrap_or(0);
+ stack.add_env_var("LAST_EXIT_CODE".into(), Value::int(code.into(), call.head));
let err_value = Value::nothing(call.head);
handle_catch(err_value, catch_block, engine_state, stack, eval_block)
} else {
diff --git a/crates/nu-cmd-lang/src/core_commands/while_.rs b/crates/nu-cmd-lang/src/core_commands/while_.rs
index e42e4ab6d1..bf9076aa0c 100644
--- a/crates/nu-cmd-lang/src/core_commands/while_.rs
+++ b/crates/nu-cmd-lang/src/core_commands/while_.rs
@@ -70,14 +70,16 @@ impl Command for While {
Err(err) => {
return Err(err);
}
- Ok(pipeline) => {
- let exit_code = pipeline.drain_with_exit_code()?;
- if exit_code != 0 {
- return Ok(
- PipelineData::new_external_stream_with_only_exit_code(
- exit_code,
- ),
- );
+ Ok(data) => {
+ if let Some(status) = data.drain()? {
+ let code = status.code();
+ if code != 0 {
+ return Ok(
+ PipelineData::new_external_stream_with_only_exit_code(
+ code,
+ ),
+ );
+ }
}
}
}
diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs
index 860572f349..bb03bbaf8c 100644
--- a/crates/nu-cmd-lang/src/example_support.rs
+++ b/crates/nu-cmd-lang/src/example_support.rs
@@ -122,10 +122,9 @@ pub fn eval_block(
stack.add_env_var("PWD".to_string(), Value::test_string(cwd.to_string_lossy()));
- match nu_engine::eval_block::(engine_state, &mut stack, &block, input) {
- Err(err) => panic!("test eval error in `{}`: {:?}", "TODO", err),
- Ok(result) => result.into_value(Span::test_data()),
- }
+ nu_engine::eval_block::(engine_state, &mut stack, &block, input)
+ .and_then(|data| data.into_value(Span::test_data()))
+ .unwrap_or_else(|err| panic!("test eval error in `{}`: {:?}", "TODO", err))
}
pub fn check_example_evaluates_to_expected_output(
diff --git a/crates/nu-color-config/src/style_computer.rs b/crates/nu-color-config/src/style_computer.rs
index 2293439183..91907c1428 100644
--- a/crates/nu-color-config/src/style_computer.rs
+++ b/crates/nu-color-config/src/style_computer.rs
@@ -58,11 +58,11 @@ impl<'a> StyleComputer<'a> {
Some(ComputableStyle::Closure(closure, span)) => {
let result = ClosureEvalOnce::new(self.engine_state, self.stack, closure.clone())
.debug(false)
- .run_with_value(value.clone());
+ .run_with_value(value.clone())
+ .and_then(|data| data.into_value(*span));
match result {
- Ok(v) => {
- let value = v.into_value(*span);
+ Ok(value) => {
// These should be the same color data forms supported by color_config.
match value {
Value::Record { .. } => color_record_to_nustyle(&value),
diff --git a/crates/nu-command/src/bytes/starts_with.rs b/crates/nu-command/src/bytes/starts_with.rs
index 69187894b4..2d7ca3e26a 100644
--- a/crates/nu-command/src/bytes/starts_with.rs
+++ b/crates/nu-command/src/bytes/starts_with.rs
@@ -60,63 +60,13 @@ impl Command for BytesStartsWith {
pattern,
cell_paths,
};
-
- match input {
- PipelineData::ExternalStream {
- stdout: Some(stream),
- span,
- ..
- } => {
- let mut i = 0;
-
- for item in stream {
- let byte_slice = match &item {
- // String and binary data are valid byte patterns
- Ok(Value::String { val, .. }) => val.as_bytes(),
- Ok(Value::Binary { val, .. }) => val,
- // If any Error value is output, echo it back
- Ok(v @ Value::Error { .. }) => return Ok(v.clone().into_pipeline_data()),
- // Unsupported data
- Ok(other) => {
- return Ok(Value::error(
- ShellError::OnlySupportsThisInputType {
- exp_input_type: "string and binary".into(),
- wrong_type: other.get_type().to_string(),
- dst_span: span,
- src_span: other.span(),
- },
- span,
- )
- .into_pipeline_data());
- }
- Err(err) => return Err(err.to_owned()),
- };
-
- let max = byte_slice.len().min(arg.pattern.len() - i);
-
- if byte_slice[..max] == arg.pattern[i..i + max] {
- i += max;
-
- if i >= arg.pattern.len() {
- return Ok(Value::bool(true, span).into_pipeline_data());
- }
- } else {
- return Ok(Value::bool(false, span).into_pipeline_data());
- }
- }
-
- // We reached the end of the stream and never returned,
- // the pattern wasn't exhausted so it probably doesn't match
- Ok(Value::bool(false, span).into_pipeline_data())
- }
- _ => operate(
- starts_with,
- arg,
- input,
- call.head,
- engine_state.ctrlc.clone(),
- ),
- }
+ operate(
+ starts_with,
+ arg,
+ input,
+ call.head,
+ engine_state.ctrlc.clone(),
+ )
}
fn examples(&self) -> Vec {
diff --git a/crates/nu-command/src/charting/histogram.rs b/crates/nu-command/src/charting/histogram.rs
index 35a9d82a3d..52964b087d 100755
--- a/crates/nu-command/src/charting/histogram.rs
+++ b/crates/nu-command/src/charting/histogram.rs
@@ -121,7 +121,7 @@ impl Command for Histogram {
};
let span = call.head;
- let data_as_value = input.into_value(span);
+ let data_as_value = input.into_value(span)?;
let value_span = data_as_value.span();
// `input` is not a list, here we can return an error.
run_histogram(
diff --git a/crates/nu-command/src/conversions/into/binary.rs b/crates/nu-command/src/conversions/into/binary.rs
index 6fb997a590..479b0fc7d7 100644
--- a/crates/nu-command/src/conversions/into/binary.rs
+++ b/crates/nu-command/src/conversions/into/binary.rs
@@ -127,25 +127,15 @@ fn into_binary(
let cell_paths = call.rest(engine_state, stack, 0)?;
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
- match input {
- PipelineData::ExternalStream { stdout: None, .. } => {
- Ok(Value::binary(vec![], head).into_pipeline_data())
- }
- PipelineData::ExternalStream {
- stdout: Some(stream),
- ..
- } => {
- // TODO: in the future, we may want this to stream out, converting each to bytes
- let output = stream.into_bytes()?;
- Ok(Value::binary(output.item, head).into_pipeline_data())
- }
- _ => {
- let args = Arguments {
- cell_paths,
- compact: call.has_flag(engine_state, stack, "compact")?,
- };
- operate(action, args, input, call.head, engine_state.ctrlc.clone())
- }
+ if let PipelineData::ByteStream(stream, ..) = input {
+ // TODO: in the future, we may want this to stream out, converting each to bytes
+ Ok(Value::binary(stream.into_bytes()?, head).into_pipeline_data())
+ } else {
+ let args = Arguments {
+ cell_paths,
+ compact: call.has_flag(engine_state, stack, "compact")?,
+ };
+ operate(action, args, input, call.head, engine_state.ctrlc.clone())
}
}
diff --git a/crates/nu-command/src/conversions/into/cell_path.rs b/crates/nu-command/src/conversions/into/cell_path.rs
index 4faa6e83d6..6da317abd3 100644
--- a/crates/nu-command/src/conversions/into/cell_path.rs
+++ b/crates/nu-command/src/conversions/into/cell_path.rs
@@ -101,11 +101,11 @@ fn into_cell_path(call: &Call, input: PipelineData) -> Result = stream.into_iter().collect();
Ok(list_to_cell_path(&list, head)?.into_pipeline_data())
}
- PipelineData::ExternalStream { span, .. } => Err(ShellError::OnlySupportsThisInputType {
+ PipelineData::ByteStream(stream, ..) => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "list, int".into(),
- wrong_type: "raw data".into(),
+ wrong_type: "byte stream".into(),
dst_span: head,
- src_span: span,
+ src_span: stream.span(),
}),
PipelineData::Empty => Err(ShellError::PipelineEmpty { dst_span: head }),
}
diff --git a/crates/nu-command/src/conversions/into/glob.rs b/crates/nu-command/src/conversions/into/glob.rs
index 8c167b0dc0..e5d03093f4 100644
--- a/crates/nu-command/src/conversions/into/glob.rs
+++ b/crates/nu-command/src/conversions/into/glob.rs
@@ -82,20 +82,12 @@ fn glob_helper(
let head = call.head;
let cell_paths = call.rest(engine_state, stack, 0)?;
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
- let args = Arguments { cell_paths };
- match input {
- PipelineData::ExternalStream { stdout: None, .. } => {
- Ok(Value::glob(String::new(), false, head).into_pipeline_data())
- }
- PipelineData::ExternalStream {
- stdout: Some(stream),
- ..
- } => {
- // TODO: in the future, we may want this to stream out, converting each to bytes
- let output = stream.into_string()?;
- Ok(Value::glob(output.item, false, head).into_pipeline_data())
- }
- _ => operate(action, args, input, head, engine_state.ctrlc.clone()),
+ if let PipelineData::ByteStream(stream, ..) = input {
+ // TODO: in the future, we may want this to stream out, converting each to bytes
+ Ok(Value::glob(stream.into_string()?, false, head).into_pipeline_data())
+ } else {
+ let args = Arguments { cell_paths };
+ operate(action, args, input, head, engine_state.ctrlc.clone())
}
}
diff --git a/crates/nu-command/src/conversions/into/record.rs b/crates/nu-command/src/conversions/into/record.rs
index c9342e8e39..e867f06e15 100644
--- a/crates/nu-command/src/conversions/into/record.rs
+++ b/crates/nu-command/src/conversions/into/record.rs
@@ -108,7 +108,7 @@ fn into_record(
call: &Call,
input: PipelineData,
) -> Result {
- let input = input.into_value(call.head);
+ let input = input.into_value(call.head)?;
let input_type = input.get_type();
let span = input.span();
let res = match input {
diff --git a/crates/nu-command/src/conversions/into/string.rs b/crates/nu-command/src/conversions/into/string.rs
index bc791a37b2..eda4f7e5a5 100644
--- a/crates/nu-command/src/conversions/into/string.rs
+++ b/crates/nu-command/src/conversions/into/string.rs
@@ -155,26 +155,18 @@ fn string_helper(
}
let cell_paths = call.rest(engine_state, stack, 0)?;
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
- let config = engine_state.get_config().clone();
- let args = Arguments {
- decimals_value,
- cell_paths,
- config,
- };
- match input {
- PipelineData::ExternalStream { stdout: None, .. } => {
- Ok(Value::string(String::new(), head).into_pipeline_data())
- }
- PipelineData::ExternalStream {
- stdout: Some(stream),
- ..
- } => {
- // TODO: in the future, we may want this to stream out, converting each to bytes
- let output = stream.into_string()?;
- Ok(Value::string(output.item, head).into_pipeline_data())
- }
- _ => operate(action, args, input, head, engine_state.ctrlc.clone()),
+ if let PipelineData::ByteStream(stream, ..) = input {
+ // TODO: in the future, we may want this to stream out, converting each to bytes
+ Ok(Value::string(stream.into_string()?, head).into_pipeline_data())
+ } else {
+ let config = engine_state.get_config().clone();
+ let args = Arguments {
+ decimals_value,
+ cell_paths,
+ config,
+ };
+ operate(action, args, input, head, engine_state.ctrlc.clone())
}
}
diff --git a/crates/nu-command/src/database/values/sqlite.rs b/crates/nu-command/src/database/values/sqlite.rs
index 9778f44993..483da7672e 100644
--- a/crates/nu-command/src/database/values/sqlite.rs
+++ b/crates/nu-command/src/database/values/sqlite.rs
@@ -91,7 +91,7 @@ impl SQLiteDatabase {
}
pub fn try_from_pipeline(input: PipelineData, span: Span) -> Result {
- let value = input.into_value(span);
+ let value = input.into_value(span)?;
Self::try_from_value(value)
}
diff --git a/crates/nu-command/src/debug/inspect.rs b/crates/nu-command/src/debug/inspect.rs
index 681d2ef6c6..ad6163c7b6 100644
--- a/crates/nu-command/src/debug/inspect.rs
+++ b/crates/nu-command/src/debug/inspect.rs
@@ -29,7 +29,7 @@ impl Command for Inspect {
input: PipelineData,
) -> Result {
let input_metadata = input.metadata();
- let input_val = input.into_value(call.head);
+ let input_val = input.into_value(call.head)?;
if input_val.is_nothing() {
return Err(ShellError::PipelineEmpty {
dst_span: call.head,
diff --git a/crates/nu-command/src/debug/timeit.rs b/crates/nu-command/src/debug/timeit.rs
index 92f8fe18cd..a445679b81 100644
--- a/crates/nu-command/src/debug/timeit.rs
+++ b/crates/nu-command/src/debug/timeit.rs
@@ -53,13 +53,12 @@ impl Command for TimeIt {
eval_block(engine_state, stack, block, input)?
} else {
let eval_expression_with_input = get_eval_expression_with_input(engine_state);
- eval_expression_with_input(engine_state, stack, command_to_run, input)
- .map(|res| res.0)?
+ eval_expression_with_input(engine_state, stack, command_to_run, input)?.0
}
} else {
PipelineData::empty()
}
- .into_value(call.head);
+ .into_value(call.head)?;
let end_time = Instant::now();
diff --git a/crates/nu-command/src/filesystem/open.rs b/crates/nu-command/src/filesystem/open.rs
index 23664bb576..5fb8527511 100644
--- a/crates/nu-command/src/filesystem/open.rs
+++ b/crates/nu-command/src/filesystem/open.rs
@@ -1,8 +1,8 @@
use super::util::get_rest_for_glob_pattern;
#[allow(deprecated)]
use nu_engine::{command_prelude::*, current_dir, get_eval_block};
-use nu_protocol::{BufferedReader, DataSource, NuGlob, PipelineMetadata, RawStream};
-use std::{io::BufReader, path::Path};
+use nu_protocol::{ByteStream, DataSource, NuGlob, PipelineMetadata};
+use std::path::Path;
#[cfg(feature = "sqlite")]
use crate::database::SQLiteDatabase;
@@ -143,23 +143,13 @@ impl Command for Open {
}
};
- let buf_reader = BufReader::new(file);
-
- let file_contents = PipelineData::ExternalStream {
- stdout: Some(RawStream::new(
- Box::new(BufferedReader::new(buf_reader)),
- ctrlc.clone(),
- call_span,
- None,
- )),
- stderr: None,
- exit_code: None,
- span: call_span,
- metadata: Some(PipelineMetadata {
+ let stream = PipelineData::ByteStream(
+ ByteStream::file(file, call_span, ctrlc.clone()),
+ Some(PipelineMetadata {
data_source: DataSource::FilePath(path.to_path_buf()),
}),
- trim_end_newline: false,
- };
+ );
+
let exts_opt: Option> = if raw {
None
} else {
@@ -184,9 +174,9 @@ impl Command for Open {
let decl = engine_state.get_decl(converter_id);
let command_output = if let Some(block_id) = decl.get_block_id() {
let block = engine_state.get_block(block_id);
- eval_block(engine_state, stack, block, file_contents)
+ eval_block(engine_state, stack, block, stream)
} else {
- decl.run(engine_state, stack, &Call::new(call_span), file_contents)
+ decl.run(engine_state, stack, &Call::new(call_span), stream)
};
output.push(command_output.map_err(|inner| {
ShellError::GenericError{
@@ -198,7 +188,7 @@ impl Command for Open {
}
})?);
}
- None => output.push(file_contents),
+ None => output.push(stream),
}
}
}
diff --git a/crates/nu-command/src/filesystem/save.rs b/crates/nu-command/src/filesystem/save.rs
index 0826284798..ca9943eafb 100644
--- a/crates/nu-command/src/filesystem/save.rs
+++ b/crates/nu-command/src/filesystem/save.rs
@@ -5,12 +5,15 @@ use nu_engine::{command_prelude::*, current_dir};
use nu_path::expand_path_with;
use nu_protocol::{
ast::{Expr, Expression},
- DataSource, OutDest, PipelineMetadata, RawStream,
+ byte_stream::copy_with_interrupt,
+ process::ChildPipe,
+ ByteStreamSource, DataSource, OutDest, PipelineMetadata,
};
use std::{
fs::File,
- io::Write,
+ io::{self, BufRead, BufReader, Read, Write},
path::{Path, PathBuf},
+ sync::{atomic::AtomicBool, Arc},
thread,
};
@@ -104,12 +107,7 @@ impl Command for Save {
});
match input {
- PipelineData::ExternalStream {
- stdout,
- stderr,
- metadata,
- ..
- } => {
+ PipelineData::ByteStream(stream, metadata) => {
check_saving_to_source_file(metadata.as_ref(), &path, stderr_path.as_ref())?;
let (file, stderr_file) = get_files(
@@ -121,40 +119,97 @@ impl Command for Save {
force,
)?;
- match (stdout, stderr) {
- (Some(stdout), stderr) => {
- // delegate a thread to redirect stderr to result.
- let handler = stderr
- .map(|stderr| match stderr_file {
- Some(stderr_file) => thread::Builder::new()
- .name("stderr redirector".to_string())
- .spawn(move || {
- stream_to_file(stderr, stderr_file, span, progress)
- }),
- None => thread::Builder::new()
- .name("stderr redirector".to_string())
- .spawn(move || stderr.drain()),
- })
- .transpose()
- .err_span(span)?;
+ let size = stream.known_size();
+ let ctrlc = engine_state.ctrlc.clone();
- let res = stream_to_file(stdout, file, span, progress);
- if let Some(h) = handler {
- h.join().map_err(|err| ShellError::ExternalCommand {
- label: "Fail to receive external commands stderr message"
- .to_string(),
- help: format!("{err:?}"),
- span,
- })??;
- }
- res?;
+ match stream.into_source() {
+ ByteStreamSource::Read(read) => {
+ stream_to_file(read, size, ctrlc, file, span, progress)?;
}
- (None, Some(stderr)) => match stderr_file {
- Some(stderr_file) => stream_to_file(stderr, stderr_file, span, progress)?,
- None => stderr.drain()?,
- },
- (None, None) => {}
- };
+ ByteStreamSource::File(source) => {
+ stream_to_file(source, size, ctrlc, file, span, progress)?;
+ }
+ ByteStreamSource::Child(mut child) => {
+ fn write_or_consume_stderr(
+ stderr: ChildPipe,
+ file: Option