2022-10-29 21:29:46 +00:00
|
|
|
use crate::input_handler::{operate, CmdArgument};
|
2022-07-09 02:42:31 +00:00
|
|
|
use nu_engine::CallExt;
|
|
|
|
use nu_protocol::ast::Call;
|
|
|
|
use nu_protocol::ast::CellPath;
|
|
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
|
|
use nu_protocol::{
|
2022-11-09 21:55:05 +00:00
|
|
|
Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
2022-07-09 02:42:31 +00:00
|
|
|
};
|
|
|
|
use std::cmp::Ordering;
|
|
|
|
|
|
|
|
#[derive(Clone)]
|
|
|
|
pub struct BytesAt;
|
|
|
|
|
|
|
|
struct Arguments {
|
|
|
|
start: isize,
|
|
|
|
end: isize,
|
|
|
|
arg_span: Span,
|
2022-10-29 21:29:46 +00:00
|
|
|
cell_paths: Option<Vec<CellPath>>,
|
2022-07-09 02:42:31 +00:00
|
|
|
}
|
|
|
|
|
2022-10-29 21:29:46 +00:00
|
|
|
impl CmdArgument for Arguments {
|
|
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
|
|
self.cell_paths.take()
|
2022-07-09 02:42:31 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// ensure given `range` is valid, and returns [start, end, val_span] pair.
|
|
|
|
fn parse_range(range: Value, head: Span) -> Result<(isize, isize, Span), ShellError> {
|
|
|
|
let (start, end, span) = match range {
|
|
|
|
Value::List { mut vals, span } => {
|
|
|
|
if vals.len() != 2 {
|
|
|
|
return Err(ShellError::UnsupportedInput(
|
Standardise the use of ShellError::UnsupportedInput and ShellError::TypeMismatch and add spans to every instance of the former (#7217)
# Description
* I was dismayed to discover recently that UnsupportedInput and
TypeMismatch are used *extremely* inconsistently across the codebase.
UnsupportedInput is sometimes used for input type-checks (as per the
name!!), but *also* used for argument type-checks. TypeMismatch is also
used for both.
I thus devised the following standard: input type-checking *only* uses
UnsupportedInput, and argument type-checking *only* uses TypeMismatch.
Moreover, to differentiate them, UnsupportedInput now has *two* error
arrows (spans), one pointing at the command and the other at the input
origin, while TypeMismatch only has the one (because the command should
always be nearby)
* In order to apply that standard, a very large number of
UnsupportedInput uses were changed so that the input's span could be
retrieved and delivered to it.
* Additionally, I noticed many places where **errors are not propagated
correctly**: there are lots of `match` sites which take a Value::Error,
then throw it away and replace it with a new Value::Error with
less/misleading information (such as reporting the error as an
"incorrect type"). I believe that the earliest errors are the most
important, and should always be propagated where possible.
* Also, to standardise one broad subset of UnsupportedInput error
messages, who all used slightly different wordings of "expected
`<type>`, got `<type>`", I created OnlySupportsThisInputType as a
variant of it.
* Finally, a bunch of error sites that had "repeated spans" - i.e. where
an error expected two spans, but `call.head` was given for both - were
fixed to use different spans.
# Example
BEFORE
```
〉20b | str starts-with 'a'
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #31:1:1]
1 │ 20b | str starts-with 'a'
· ┬
· ╰── Input's type is filesize. This command only works with strings.
╰────
〉'a' | math cos
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #33:1:1]
1 │ 'a' | math cos
· ─┬─
· ╰── Only numerical values are supported, input type: String
╰────
〉0x[12] | encode utf8
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #38:1:1]
1 │ 0x[12] | encode utf8
· ───┬──
· ╰── non-string input
╰────
```
AFTER
```
〉20b | str starts-with 'a'
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #1:1:1]
1 │ 20b | str starts-with 'a'
· ┬ ───────┬───────
· │ ╰── only string input data is supported
· ╰── input type: filesize
╰────
〉'a' | math cos
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #2:1:1]
1 │ 'a' | math cos
· ─┬─ ────┬───
· │ ╰── only numeric input data is supported
· ╰── input type: string
╰────
〉0x[12] | encode utf8
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #3:1:1]
1 │ 0x[12] | encode utf8
· ───┬── ───┬──
· │ ╰── only string input data is supported
· ╰── input type: binary
╰────
```
# User-Facing Changes
Various error messages suddenly make more sense (i.e. have two arrows
instead of one).
# Tests + Formatting
Don't forget to add tests that cover your changes.
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 -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2022-12-23 06:48:53 +00:00
|
|
|
"More than two indices in range".to_string(),
|
|
|
|
"value originates from here".to_string(),
|
|
|
|
head,
|
2022-07-09 02:42:31 +00:00
|
|
|
span,
|
|
|
|
));
|
|
|
|
} else {
|
|
|
|
let end = vals.pop().expect("Already check has size 2");
|
|
|
|
let end = match end {
|
|
|
|
Value::Int { val, .. } => val.to_string(),
|
|
|
|
Value::String { val, .. } => val,
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 07:31:26 +00:00
|
|
|
// Explicitly propagate errors instead of dropping them.
|
2023-03-12 08:57:27 +00:00
|
|
|
Value::Error { error } => return Err(*error),
|
2022-07-09 02:42:31 +00:00
|
|
|
other => {
|
|
|
|
return Err(ShellError::UnsupportedInput(
|
Standardise the use of ShellError::UnsupportedInput and ShellError::TypeMismatch and add spans to every instance of the former (#7217)
# Description
* I was dismayed to discover recently that UnsupportedInput and
TypeMismatch are used *extremely* inconsistently across the codebase.
UnsupportedInput is sometimes used for input type-checks (as per the
name!!), but *also* used for argument type-checks. TypeMismatch is also
used for both.
I thus devised the following standard: input type-checking *only* uses
UnsupportedInput, and argument type-checking *only* uses TypeMismatch.
Moreover, to differentiate them, UnsupportedInput now has *two* error
arrows (spans), one pointing at the command and the other at the input
origin, while TypeMismatch only has the one (because the command should
always be nearby)
* In order to apply that standard, a very large number of
UnsupportedInput uses were changed so that the input's span could be
retrieved and delivered to it.
* Additionally, I noticed many places where **errors are not propagated
correctly**: there are lots of `match` sites which take a Value::Error,
then throw it away and replace it with a new Value::Error with
less/misleading information (such as reporting the error as an
"incorrect type"). I believe that the earliest errors are the most
important, and should always be propagated where possible.
* Also, to standardise one broad subset of UnsupportedInput error
messages, who all used slightly different wordings of "expected
`<type>`, got `<type>`", I created OnlySupportsThisInputType as a
variant of it.
* Finally, a bunch of error sites that had "repeated spans" - i.e. where
an error expected two spans, but `call.head` was given for both - were
fixed to use different spans.
# Example
BEFORE
```
〉20b | str starts-with 'a'
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #31:1:1]
1 │ 20b | str starts-with 'a'
· ┬
· ╰── Input's type is filesize. This command only works with strings.
╰────
〉'a' | math cos
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #33:1:1]
1 │ 'a' | math cos
· ─┬─
· ╰── Only numerical values are supported, input type: String
╰────
〉0x[12] | encode utf8
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #38:1:1]
1 │ 0x[12] | encode utf8
· ───┬──
· ╰── non-string input
╰────
```
AFTER
```
〉20b | str starts-with 'a'
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #1:1:1]
1 │ 20b | str starts-with 'a'
· ┬ ───────┬───────
· │ ╰── only string input data is supported
· ╰── input type: filesize
╰────
〉'a' | math cos
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #2:1:1]
1 │ 'a' | math cos
· ─┬─ ────┬───
· │ ╰── only numeric input data is supported
· ╰── input type: string
╰────
〉0x[12] | encode utf8
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #3:1:1]
1 │ 0x[12] | encode utf8
· ───┬── ───┬──
· │ ╰── only string input data is supported
· ╰── input type: binary
╰────
```
# User-Facing Changes
Various error messages suddenly make more sense (i.e. have two arrows
instead of one).
# Tests + Formatting
Don't forget to add tests that cover your changes.
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 -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2022-12-23 06:48:53 +00:00
|
|
|
"Only string or list<int> ranges are supported".into(),
|
|
|
|
format!("input type: {:?}", other.get_type()),
|
|
|
|
head,
|
|
|
|
other.expect_span(),
|
2022-07-09 02:42:31 +00:00
|
|
|
))
|
|
|
|
}
|
|
|
|
};
|
|
|
|
let start = vals.pop().expect("Already check has size 1");
|
|
|
|
let start = match start {
|
|
|
|
Value::Int { val, .. } => val.to_string(),
|
|
|
|
Value::String { val, .. } => val,
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 07:31:26 +00:00
|
|
|
// Explicitly propagate errors instead of dropping them.
|
2023-03-12 08:57:27 +00:00
|
|
|
Value::Error { error } => return Err(*error),
|
2022-07-09 02:42:31 +00:00
|
|
|
other => {
|
|
|
|
return Err(ShellError::UnsupportedInput(
|
Standardise the use of ShellError::UnsupportedInput and ShellError::TypeMismatch and add spans to every instance of the former (#7217)
# Description
* I was dismayed to discover recently that UnsupportedInput and
TypeMismatch are used *extremely* inconsistently across the codebase.
UnsupportedInput is sometimes used for input type-checks (as per the
name!!), but *also* used for argument type-checks. TypeMismatch is also
used for both.
I thus devised the following standard: input type-checking *only* uses
UnsupportedInput, and argument type-checking *only* uses TypeMismatch.
Moreover, to differentiate them, UnsupportedInput now has *two* error
arrows (spans), one pointing at the command and the other at the input
origin, while TypeMismatch only has the one (because the command should
always be nearby)
* In order to apply that standard, a very large number of
UnsupportedInput uses were changed so that the input's span could be
retrieved and delivered to it.
* Additionally, I noticed many places where **errors are not propagated
correctly**: there are lots of `match` sites which take a Value::Error,
then throw it away and replace it with a new Value::Error with
less/misleading information (such as reporting the error as an
"incorrect type"). I believe that the earliest errors are the most
important, and should always be propagated where possible.
* Also, to standardise one broad subset of UnsupportedInput error
messages, who all used slightly different wordings of "expected
`<type>`, got `<type>`", I created OnlySupportsThisInputType as a
variant of it.
* Finally, a bunch of error sites that had "repeated spans" - i.e. where
an error expected two spans, but `call.head` was given for both - were
fixed to use different spans.
# Example
BEFORE
```
〉20b | str starts-with 'a'
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #31:1:1]
1 │ 20b | str starts-with 'a'
· ┬
· ╰── Input's type is filesize. This command only works with strings.
╰────
〉'a' | math cos
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #33:1:1]
1 │ 'a' | math cos
· ─┬─
· ╰── Only numerical values are supported, input type: String
╰────
〉0x[12] | encode utf8
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #38:1:1]
1 │ 0x[12] | encode utf8
· ───┬──
· ╰── non-string input
╰────
```
AFTER
```
〉20b | str starts-with 'a'
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #1:1:1]
1 │ 20b | str starts-with 'a'
· ┬ ───────┬───────
· │ ╰── only string input data is supported
· ╰── input type: filesize
╰────
〉'a' | math cos
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #2:1:1]
1 │ 'a' | math cos
· ─┬─ ────┬───
· │ ╰── only numeric input data is supported
· ╰── input type: string
╰────
〉0x[12] | encode utf8
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #3:1:1]
1 │ 0x[12] | encode utf8
· ───┬── ───┬──
· │ ╰── only string input data is supported
· ╰── input type: binary
╰────
```
# User-Facing Changes
Various error messages suddenly make more sense (i.e. have two arrows
instead of one).
# Tests + Formatting
Don't forget to add tests that cover your changes.
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 -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2022-12-23 06:48:53 +00:00
|
|
|
"Only string or list<int> ranges are supported".into(),
|
|
|
|
format!("input type: {:?}", other.get_type()),
|
|
|
|
head,
|
|
|
|
other.expect_span(),
|
2022-07-09 02:42:31 +00:00
|
|
|
))
|
|
|
|
}
|
|
|
|
};
|
|
|
|
(start, end, span)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Value::String { val, span } => {
|
2023-01-28 21:22:56 +00:00
|
|
|
let split_result = val.split_once(',');
|
|
|
|
match split_result {
|
2022-07-09 02:42:31 +00:00
|
|
|
Some((start, end)) => (start.to_string(), end.to_string(), span),
|
|
|
|
None => {
|
|
|
|
return Err(ShellError::UnsupportedInput(
|
|
|
|
"could not perform subbytes".to_string(),
|
Standardise the use of ShellError::UnsupportedInput and ShellError::TypeMismatch and add spans to every instance of the former (#7217)
# Description
* I was dismayed to discover recently that UnsupportedInput and
TypeMismatch are used *extremely* inconsistently across the codebase.
UnsupportedInput is sometimes used for input type-checks (as per the
name!!), but *also* used for argument type-checks. TypeMismatch is also
used for both.
I thus devised the following standard: input type-checking *only* uses
UnsupportedInput, and argument type-checking *only* uses TypeMismatch.
Moreover, to differentiate them, UnsupportedInput now has *two* error
arrows (spans), one pointing at the command and the other at the input
origin, while TypeMismatch only has the one (because the command should
always be nearby)
* In order to apply that standard, a very large number of
UnsupportedInput uses were changed so that the input's span could be
retrieved and delivered to it.
* Additionally, I noticed many places where **errors are not propagated
correctly**: there are lots of `match` sites which take a Value::Error,
then throw it away and replace it with a new Value::Error with
less/misleading information (such as reporting the error as an
"incorrect type"). I believe that the earliest errors are the most
important, and should always be propagated where possible.
* Also, to standardise one broad subset of UnsupportedInput error
messages, who all used slightly different wordings of "expected
`<type>`, got `<type>`", I created OnlySupportsThisInputType as a
variant of it.
* Finally, a bunch of error sites that had "repeated spans" - i.e. where
an error expected two spans, but `call.head` was given for both - were
fixed to use different spans.
# Example
BEFORE
```
〉20b | str starts-with 'a'
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #31:1:1]
1 │ 20b | str starts-with 'a'
· ┬
· ╰── Input's type is filesize. This command only works with strings.
╰────
〉'a' | math cos
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #33:1:1]
1 │ 'a' | math cos
· ─┬─
· ╰── Only numerical values are supported, input type: String
╰────
〉0x[12] | encode utf8
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #38:1:1]
1 │ 0x[12] | encode utf8
· ───┬──
· ╰── non-string input
╰────
```
AFTER
```
〉20b | str starts-with 'a'
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #1:1:1]
1 │ 20b | str starts-with 'a'
· ┬ ───────┬───────
· │ ╰── only string input data is supported
· ╰── input type: filesize
╰────
〉'a' | math cos
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #2:1:1]
1 │ 'a' | math cos
· ─┬─ ────┬───
· │ ╰── only numeric input data is supported
· ╰── input type: string
╰────
〉0x[12] | encode utf8
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #3:1:1]
1 │ 0x[12] | encode utf8
· ───┬── ───┬──
· │ ╰── only string input data is supported
· ╰── input type: binary
╰────
```
# User-Facing Changes
Various error messages suddenly make more sense (i.e. have two arrows
instead of one).
# Tests + Formatting
Don't forget to add tests that cover your changes.
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 -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2022-12-23 06:48:53 +00:00
|
|
|
"with this range".to_string(),
|
|
|
|
head,
|
2022-07-09 02:42:31 +00:00
|
|
|
span,
|
|
|
|
))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 07:31:26 +00:00
|
|
|
// Explicitly propagate errors instead of dropping them.
|
2023-03-12 08:57:27 +00:00
|
|
|
Value::Error { error } => return Err(*error),
|
2022-07-09 02:42:31 +00:00
|
|
|
other => {
|
|
|
|
return Err(ShellError::UnsupportedInput(
|
|
|
|
"could not perform subbytes".to_string(),
|
Standardise the use of ShellError::UnsupportedInput and ShellError::TypeMismatch and add spans to every instance of the former (#7217)
# Description
* I was dismayed to discover recently that UnsupportedInput and
TypeMismatch are used *extremely* inconsistently across the codebase.
UnsupportedInput is sometimes used for input type-checks (as per the
name!!), but *also* used for argument type-checks. TypeMismatch is also
used for both.
I thus devised the following standard: input type-checking *only* uses
UnsupportedInput, and argument type-checking *only* uses TypeMismatch.
Moreover, to differentiate them, UnsupportedInput now has *two* error
arrows (spans), one pointing at the command and the other at the input
origin, while TypeMismatch only has the one (because the command should
always be nearby)
* In order to apply that standard, a very large number of
UnsupportedInput uses were changed so that the input's span could be
retrieved and delivered to it.
* Additionally, I noticed many places where **errors are not propagated
correctly**: there are lots of `match` sites which take a Value::Error,
then throw it away and replace it with a new Value::Error with
less/misleading information (such as reporting the error as an
"incorrect type"). I believe that the earliest errors are the most
important, and should always be propagated where possible.
* Also, to standardise one broad subset of UnsupportedInput error
messages, who all used slightly different wordings of "expected
`<type>`, got `<type>`", I created OnlySupportsThisInputType as a
variant of it.
* Finally, a bunch of error sites that had "repeated spans" - i.e. where
an error expected two spans, but `call.head` was given for both - were
fixed to use different spans.
# Example
BEFORE
```
〉20b | str starts-with 'a'
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #31:1:1]
1 │ 20b | str starts-with 'a'
· ┬
· ╰── Input's type is filesize. This command only works with strings.
╰────
〉'a' | math cos
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #33:1:1]
1 │ 'a' | math cos
· ─┬─
· ╰── Only numerical values are supported, input type: String
╰────
〉0x[12] | encode utf8
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #38:1:1]
1 │ 0x[12] | encode utf8
· ───┬──
· ╰── non-string input
╰────
```
AFTER
```
〉20b | str starts-with 'a'
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #1:1:1]
1 │ 20b | str starts-with 'a'
· ┬ ───────┬───────
· │ ╰── only string input data is supported
· ╰── input type: filesize
╰────
〉'a' | math cos
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #2:1:1]
1 │ 'a' | math cos
· ─┬─ ────┬───
· │ ╰── only numeric input data is supported
· ╰── input type: string
╰────
〉0x[12] | encode utf8
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #3:1:1]
1 │ 0x[12] | encode utf8
· ───┬── ───┬──
· │ ╰── only string input data is supported
· ╰── input type: binary
╰────
```
# User-Facing Changes
Various error messages suddenly make more sense (i.e. have two arrows
instead of one).
# Tests + Formatting
Don't forget to add tests that cover your changes.
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 -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2022-12-23 06:48:53 +00:00
|
|
|
"with this range".to_string(),
|
|
|
|
head,
|
|
|
|
other.expect_span(),
|
2022-07-09 02:42:31 +00:00
|
|
|
))
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let start: isize = if start.is_empty() || start == "_" {
|
|
|
|
0
|
|
|
|
} else {
|
2023-01-24 11:23:42 +00:00
|
|
|
start.trim().parse().map_err(|_| {
|
|
|
|
ShellError::UnsupportedInput(
|
|
|
|
"could not perform subbytes".to_string(),
|
|
|
|
"with this range".to_string(),
|
|
|
|
head,
|
|
|
|
span,
|
|
|
|
)
|
|
|
|
})?
|
2022-07-09 02:42:31 +00:00
|
|
|
};
|
|
|
|
let end: isize = if end.is_empty() || end == "_" {
|
|
|
|
isize::max_value()
|
|
|
|
} else {
|
2023-01-24 11:23:42 +00:00
|
|
|
end.trim().parse().map_err(|_| {
|
|
|
|
ShellError::UnsupportedInput(
|
|
|
|
"could not perform subbytes".to_string(),
|
|
|
|
"with this range".to_string(),
|
|
|
|
head,
|
|
|
|
span,
|
|
|
|
)
|
|
|
|
})?
|
2022-07-09 02:42:31 +00:00
|
|
|
};
|
|
|
|
Ok((start, end, span))
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Command for BytesAt {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
"bytes at"
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
Signature::build("bytes at")
|
2022-11-09 21:55:05 +00:00
|
|
|
.input_output_types(vec![(Type::Binary, Type::Binary)])
|
|
|
|
.vectorizes_over_list(true)
|
2022-07-09 02:42:31 +00:00
|
|
|
.required("range", SyntaxShape::Any, "the indexes to get bytes")
|
|
|
|
.rest(
|
|
|
|
"rest",
|
|
|
|
SyntaxShape::CellPath,
|
2022-11-10 05:49:11 +00:00
|
|
|
"for a data structure input, get bytes from data at the given cell paths",
|
2022-07-09 02:42:31 +00:00
|
|
|
)
|
|
|
|
.category(Category::Bytes)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
"Get bytes defined by a range. Note that the start is included but the end is excluded, and that the first byte is index 0."
|
|
|
|
}
|
|
|
|
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
|
|
vec!["slice"]
|
|
|
|
}
|
|
|
|
|
|
|
|
fn run(
|
|
|
|
&self,
|
|
|
|
engine_state: &EngineState,
|
|
|
|
stack: &mut Stack,
|
|
|
|
call: &Call,
|
|
|
|
input: PipelineData,
|
|
|
|
) -> Result<PipelineData, ShellError> {
|
|
|
|
let range: Value = call.req(engine_state, stack, 0)?;
|
|
|
|
let (start, end, arg_span) = parse_range(range, call.head)?;
|
2022-10-29 21:29:46 +00:00
|
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
|
2022-11-04 15:27:23 +00:00
|
|
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
2022-07-09 02:42:31 +00:00
|
|
|
let arg = Arguments {
|
|
|
|
start,
|
|
|
|
end,
|
|
|
|
arg_span,
|
2022-10-29 21:29:46 +00:00
|
|
|
cell_paths,
|
2022-07-09 02:42:31 +00:00
|
|
|
};
|
|
|
|
operate(at, arg, input, call.head, engine_state.ctrlc.clone())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
|
|
vec![
|
|
|
|
Example {
|
|
|
|
description: "Get a subbytes `0x[10 01]` from the bytes `0x[33 44 55 10 01 13]`",
|
|
|
|
example: " 0x[33 44 55 10 01 13] | bytes at [3 4]",
|
|
|
|
result: Some(Value::Binary {
|
|
|
|
val: vec![0x10],
|
|
|
|
span: Span::test_data(),
|
|
|
|
}),
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description: "Alternatively, you can use the form",
|
|
|
|
example: " 0x[33 44 55 10 01 13] | bytes at '3,4'",
|
|
|
|
result: Some(Value::Binary {
|
|
|
|
val: vec![0x10],
|
|
|
|
span: Span::test_data(),
|
|
|
|
}),
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description: "Drop the last `n` characters from the string",
|
|
|
|
example: " 0x[33 44 55 10 01 13] | bytes at ',-3'",
|
|
|
|
result: Some(Value::Binary {
|
|
|
|
val: vec![0x33, 0x44, 0x55],
|
|
|
|
span: Span::test_data(),
|
|
|
|
}),
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description: "Get the remaining characters from a starting index",
|
|
|
|
example: " 0x[33 44 55 10 01 13] | bytes at '3,'",
|
|
|
|
result: Some(Value::Binary {
|
|
|
|
val: vec![0x10, 0x01, 0x13],
|
|
|
|
span: Span::test_data(),
|
|
|
|
}),
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description: "Get the characters from the beginning until ending index",
|
|
|
|
example: " 0x[33 44 55 10 01 13] | bytes at ',4'",
|
|
|
|
result: Some(Value::Binary {
|
|
|
|
val: vec![0x33, 0x44, 0x55, 0x10],
|
|
|
|
span: Span::test_data(),
|
|
|
|
}),
|
|
|
|
},
|
|
|
|
Example {
|
|
|
|
description:
|
|
|
|
"Or the characters from the beginning until ending index inside a table",
|
|
|
|
example: r#" [[ColA ColB ColC]; [0x[11 12 13] 0x[14 15 16] 0x[17 18 19]]] | bytes at "1," ColB ColC"#,
|
|
|
|
result: Some(Value::List {
|
|
|
|
vals: vec![Value::Record {
|
|
|
|
cols: vec!["ColA".to_string(), "ColB".to_string(), "ColC".to_string()],
|
|
|
|
vals: vec![
|
|
|
|
Value::Binary {
|
|
|
|
val: vec![0x11, 0x12, 0x13],
|
|
|
|
span: Span::test_data(),
|
|
|
|
},
|
|
|
|
Value::Binary {
|
|
|
|
val: vec![0x15, 0x16],
|
|
|
|
span: Span::test_data(),
|
|
|
|
},
|
|
|
|
Value::Binary {
|
|
|
|
val: vec![0x18, 0x19],
|
|
|
|
span: Span::test_data(),
|
|
|
|
},
|
|
|
|
],
|
|
|
|
span: Span::test_data(),
|
|
|
|
}],
|
|
|
|
span: Span::test_data(),
|
|
|
|
}),
|
|
|
|
},
|
|
|
|
]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-10-29 21:29:46 +00:00
|
|
|
fn at(val: &Value, args: &Arguments, span: Span) -> Value {
|
|
|
|
match val {
|
|
|
|
Value::Binary {
|
|
|
|
val,
|
|
|
|
span: val_span,
|
|
|
|
} => at_impl(val, args, *val_span),
|
Standardise the use of ShellError::UnsupportedInput and ShellError::TypeMismatch and add spans to every instance of the former (#7217)
# Description
* I was dismayed to discover recently that UnsupportedInput and
TypeMismatch are used *extremely* inconsistently across the codebase.
UnsupportedInput is sometimes used for input type-checks (as per the
name!!), but *also* used for argument type-checks. TypeMismatch is also
used for both.
I thus devised the following standard: input type-checking *only* uses
UnsupportedInput, and argument type-checking *only* uses TypeMismatch.
Moreover, to differentiate them, UnsupportedInput now has *two* error
arrows (spans), one pointing at the command and the other at the input
origin, while TypeMismatch only has the one (because the command should
always be nearby)
* In order to apply that standard, a very large number of
UnsupportedInput uses were changed so that the input's span could be
retrieved and delivered to it.
* Additionally, I noticed many places where **errors are not propagated
correctly**: there are lots of `match` sites which take a Value::Error,
then throw it away and replace it with a new Value::Error with
less/misleading information (such as reporting the error as an
"incorrect type"). I believe that the earliest errors are the most
important, and should always be propagated where possible.
* Also, to standardise one broad subset of UnsupportedInput error
messages, who all used slightly different wordings of "expected
`<type>`, got `<type>`", I created OnlySupportsThisInputType as a
variant of it.
* Finally, a bunch of error sites that had "repeated spans" - i.e. where
an error expected two spans, but `call.head` was given for both - were
fixed to use different spans.
# Example
BEFORE
```
〉20b | str starts-with 'a'
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #31:1:1]
1 │ 20b | str starts-with 'a'
· ┬
· ╰── Input's type is filesize. This command only works with strings.
╰────
〉'a' | math cos
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #33:1:1]
1 │ 'a' | math cos
· ─┬─
· ╰── Only numerical values are supported, input type: String
╰────
〉0x[12] | encode utf8
Error: nu::shell::unsupported_input (link)
× Unsupported input
╭─[entry #38:1:1]
1 │ 0x[12] | encode utf8
· ───┬──
· ╰── non-string input
╰────
```
AFTER
```
〉20b | str starts-with 'a'
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #1:1:1]
1 │ 20b | str starts-with 'a'
· ┬ ───────┬───────
· │ ╰── only string input data is supported
· ╰── input type: filesize
╰────
〉'a' | math cos
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #2:1:1]
1 │ 'a' | math cos
· ─┬─ ────┬───
· │ ╰── only numeric input data is supported
· ╰── input type: string
╰────
〉0x[12] | encode utf8
Error: nu::shell::pipeline_mismatch (link)
× Pipeline mismatch.
╭─[entry #3:1:1]
1 │ 0x[12] | encode utf8
· ───┬── ───┬──
· │ ╰── only string input data is supported
· ╰── input type: binary
╰────
```
# User-Facing Changes
Various error messages suddenly make more sense (i.e. have two arrows
instead of one).
# Tests + Formatting
Don't forget to add tests that cover your changes.
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 -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2022-12-23 06:48:53 +00:00
|
|
|
// Propagate errors by explicitly matching them before the final case.
|
|
|
|
Value::Error { .. } => val.clone(),
|
2022-10-29 21:29:46 +00:00
|
|
|
other => Value::Error {
|
2023-03-12 08:57:27 +00:00
|
|
|
error: Box::new(ShellError::OnlySupportsThisInputType {
|
2023-03-01 19:34:48 +00:00
|
|
|
exp_input_type: "binary".into(),
|
|
|
|
wrong_type: other.get_type().to_string(),
|
|
|
|
dst_span: span,
|
|
|
|
src_span: other.expect_span(),
|
2023-03-12 08:57:27 +00:00
|
|
|
}),
|
2022-10-29 21:29:46 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn at_impl(input: &[u8], arg: &Arguments, span: Span) -> Value {
|
2022-07-09 02:42:31 +00:00
|
|
|
let len: isize = input.len() as isize;
|
|
|
|
|
|
|
|
let start: isize = if arg.start < 0 {
|
|
|
|
arg.start + len
|
|
|
|
} else {
|
|
|
|
arg.start
|
|
|
|
};
|
|
|
|
let end: isize = if arg.end < 0 {
|
|
|
|
std::cmp::max(len + arg.end, 0)
|
|
|
|
} else {
|
|
|
|
arg.end
|
|
|
|
};
|
|
|
|
|
|
|
|
if start < len && end >= 0 {
|
|
|
|
match start.cmp(&end) {
|
|
|
|
Ordering::Equal => Value::Binary { val: vec![], span },
|
|
|
|
Ordering::Greater => Value::Error {
|
2023-03-12 08:57:27 +00:00
|
|
|
error: Box::new(ShellError::TypeMismatch {
|
2023-03-06 10:31:07 +00:00
|
|
|
err_message: "End must be greater than or equal to Start".to_string(),
|
|
|
|
span: arg.arg_span,
|
2023-03-12 08:57:27 +00:00
|
|
|
}),
|
2022-07-09 02:42:31 +00:00
|
|
|
},
|
|
|
|
Ordering::Less => Value::Binary {
|
|
|
|
val: {
|
|
|
|
let input_iter = input.iter().copied().skip(start as usize);
|
|
|
|
if end == isize::max_value() {
|
|
|
|
input_iter.collect()
|
|
|
|
} else {
|
|
|
|
input_iter.take((end - start) as usize).collect()
|
|
|
|
}
|
|
|
|
},
|
|
|
|
span,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
Value::Binary { val: vec![], span }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_examples() {
|
|
|
|
use crate::test_examples;
|
|
|
|
|
|
|
|
test_examples(BytesAt {})
|
|
|
|
}
|
|
|
|
}
|