extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 16:33:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Document and critically review ShellError variants - Ep. 1 (#8229)

Browse Source 
# Description

The `ShellError` enum at the moment is kind of messy. 

Many variants are basic tuple structs where you always have to reference
the implementation with its macro invocation to know which field serves
which purpose.
Furthermore we have both variants that are kind of redundant or either
overly broad to be useful for the user to match on or overly specific
with few uses.

So I set out to start fixing the lacking documentation and naming to
make it feasible to critically review the individual usages and fix
those.
Furthermore we can decide to join or split up variants that don't seem
to be fit for purpose.

Feel free to add review comments if you spot inconsistent use of
`ShellError` variants.

- Name fields on `ShellError::OperatorOverflow`
- Name fields on `ShellError::PipelineMismatch`
- Add doc to `ShellError::OnlySupportsThisInputType`
- Name `ShellError::OnlySupportsThisInputType`
- Name field on `ShellError::PipelineEmpty`
- Comment about issues with `TypeMismatch*`
- Fix a few `exp_input_type`s
- Name fields on `ShellError::InvalidRange`

# User-Facing Changes

(None now, end goal more explicit and consistent error messages)

# Tests + Formatting

(No additional tests needed so far)
This commit is contained in:
Stefan Holderbach 2023-03-01 20:34:48 +01:00 committed by GitHub
parent 0a1af85200
commit 438062d7fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
104 changed files with 749 additions and 752 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/nu-command/src/bits/and.rs
View File

@ -45,7 +45,7 @@ impl Command for SubCommand {
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, target, head),
@ -81,13 +81,12 @@ fn operate(value: Value, target: i64, head: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/bits/not.rs
View File

@ -65,7 +65,7 @@ impl Command for SubCommand {
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head, signed, bytes_len),
@ -150,12 +150,12 @@ fn operate(value: Value, head: Span, signed: bool, number_size: NumberBytes) ->
// Propagate errors inside the value
Value::Error { .. } => other,
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
},
}

15
crates/nu-command/src/bits/or.rs
View File

@ -45,7 +45,7 @@ impl Command for SubCommand {
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, target, head),
@ -81,13 +81,12 @@ fn operate(value: Value, target: i64, head: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

15
crates/nu-command/src/bits/rotate_left.rs
View File

@ -68,7 +68,7 @@ impl Command for SubCommand {
}
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, bits, head, signed, bytes_len),
@ -137,13 +137,12 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

15
crates/nu-command/src/bits/rotate_right.rs
View File

@ -68,7 +68,7 @@ impl Command for SubCommand {
}
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, bits, head, signed, bytes_len),
@ -141,13 +141,12 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

15
crates/nu-command/src/bits/shift_left.rs
View File

@ -68,7 +68,7 @@ impl Command for SubCommand {
}
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, bits, head, signed, bytes_len),
@ -160,13 +160,12 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

15
crates/nu-command/src/bits/shift_right.rs
View File

@ -68,7 +68,7 @@ impl Command for SubCommand {
}
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, bits, head, signed, bytes_len),
@ -150,13 +150,12 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

15
crates/nu-command/src/bits/xor.rs
View File

@ -44,7 +44,7 @@ impl Command for SubCommand {
let target: i64 = call.req(engine_state, stack, 0)?;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, target, head),
@ -80,13 +80,12 @@ fn operate(value: Value, target: i64, head: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/bytes/add.rs
View File

@ -125,13 +125,12 @@ fn add(val: &Value, args: &Arguments, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => val.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/bytes/at.rs
View File

@ -249,13 +249,12 @@ fn at(val: &Value, args: &Arguments, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => val.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/bytes/collect.rs
View File

@ -57,13 +57,12 @@ impl Command for BytesCollect {
// Explicitly propagate errors instead of dropping them.
Value::Error { error } => return Err(error),
other => {
return Err(ShellError::OnlySupportsThisInputType(
"integer".into(),
other.get_type().to_string(),
call.head,
// This line requires the Value::Error match above.
other.expect_span(),
));
return Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: call.head,
src_span: other.expect_span(),
});
}
}
}

13
crates/nu-command/src/bytes/ends_with.rs
View File

@ -93,13 +93,12 @@ fn ends_with(val: &Value, args: &Arguments, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => val.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"binary".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/bytes/index_of.rs
View File

@ -135,13 +135,12 @@ fn index_of(val: &Value, args: &Arguments, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => val.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"binary".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/bytes/length.rs
View File

@ -74,13 +74,12 @@ fn length(val: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => val.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"binary".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/bytes/remove.rs
View File

@ -142,13 +142,12 @@ fn remove(val: &Value, args: &Arguments, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => val.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"binary".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/bytes/replace.rs
View File

@ -133,13 +133,12 @@ fn replace(val: &Value, args: &Arguments, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => val.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"binary".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/bytes/reverse.rs
View File

@ -84,13 +84,12 @@ fn reverse(val: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => val.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"binary".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

26
crates/nu-command/src/bytes/starts_with.rs
View File

@ -80,13 +80,12 @@ impl Command for BytesStartsWith {
// Unsupported data
Ok(other) => {
return Ok(Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string and binary".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string and binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
}
.into_pipeline_data());
}
@ -150,13 +149,12 @@ fn starts_with(val: &Value, args: &Arguments, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => val.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"binary".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/conversions/fill.rs
View File

@ -193,13 +193,12 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => input.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"int, filesize, float, string".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "int, filesize, float, string".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/conversions/fmt.rs
View File

@ -87,13 +87,12 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => input.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer or filesize".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer or filesize".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/conversions/into/binary.rs
View File

@ -188,13 +188,13 @@ pub fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => input.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer, float, filesize, string, date, duration, binary or bool".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer, float, filesize, string, date, duration, binary or bool"
.into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/conversions/into/bool.rs
View File

@ -166,13 +166,12 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => input.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"bool, integer, float or string".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "bool, integer, float or string".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

26
crates/nu-command/src/conversions/into/datetime.rs
View File

@ -213,13 +213,12 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
Value::Error { .. } => return input.clone(),
other => {
return Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string and integer".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string and integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
};
}
};
@ -332,13 +331,12 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => input.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/conversions/into/decimal.rs
View File

@ -108,13 +108,12 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, head: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => input.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string, integer or bool".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string, integer or bool".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

13
crates/nu-command/src/conversions/into/duration.rs
View File

@ -486,13 +486,12 @@ fn action(
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => input.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string or duration".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string or duration".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}

12
crates/nu-command/src/conversions/into/filesize.rs
View File

@ -117,12 +117,12 @@ pub fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
span: value_span,
},
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string and integer".into(),
other.get_type().to_string(),
span,
value_span,
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string and integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: value_span,
},
},
}
} else {

27
crates/nu-command/src/conversions/into/int.rs
View File

@ -246,13 +246,13 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => input.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"integer, float, filesize, date, string, binary, duration or bool".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "integer, float, filesize, date, string, binary, duration or bool"
.into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
},
}
}
@ -293,13 +293,12 @@ fn convert_int(input: &Value, head: Span, radix: u32) -> Value {
Value::Error { .. } => return input.clone(),
other => {
return Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string and integer".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string and integer".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
};
}
};

13
crates/nu-command/src/conversions/into/record.rs
View File

@ -185,13 +185,12 @@ fn into_record(
Value::Record { cols, vals, span } => Value::Record { cols, vals, span },
Value::Error { .. } => input,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
other.get_type().to_string(),
call.head,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: other.get_type().to_string(),
dst_span: call.head,
src_span: other.expect_span(),
},
},
};
Ok(res.into_pipeline_data())

13
crates/nu-command/src/database/commands/into_sqlite.rs
View File

@ -218,13 +218,12 @@ fn action(
}
// Propagate errors by explicitly matching them before the final case.
Value::Error { error } => Err(error.clone()),
other => Err(ShellError::OnlySupportsThisInputType(
"list".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
)),
other => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "list".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
}),
}
}

2
crates/nu-command/src/date/format.rs
View File

@ -63,7 +63,7 @@ impl Command for SubCommand {
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| match &format {

2
crates/nu-command/src/date/humanize.rs
View File

@ -49,7 +49,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(move |value| helper(value, head), engine_state.ctrlc.clone())
}

2
crates/nu-command/src/date/to_record.rs
View File

@ -44,7 +44,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(PipelineEmpty(head));
return Err(PipelineEmpty { dst_span: head });
}
input.map(move |value| helper(value, head), engine_state.ctrlc.clone())
}

2
crates/nu-command/src/date/to_table.rs
View File

@ -44,7 +44,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(PipelineEmpty(head));
return Err(PipelineEmpty { dst_span: head });
}
input.map(move |value| helper(value, head), engine_state.ctrlc.clone())
}

2
crates/nu-command/src/date/to_timezone.rs
View File

@ -58,7 +58,7 @@ impl Command for SubCommand {
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| helper(value, head, &timezone),

13
crates/nu-command/src/filesystem/save.rs
View File

@ -380,13 +380,12 @@ fn stream_to_file(
// Propagate errors by explicitly matching them before the final case.
Value::Error { error } => return Err(error),
other => {
return Err(ShellError::OnlySupportsThisInputType(
"string or binary".into(),
other.get_type().to_string(),
span,
// This line requires the Value::Error match above.
other.expect_span(),
));
return Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "string or binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
});
}
},
Err(err) => {

30
crates/nu-command/src/filters/columns.rs
View File

@ -138,26 +138,20 @@ fn getcol(
.set_metadata(metadata)),
// Propagate errors
PipelineData::Value(Value::Error { error }, ..) => Err(error),
PipelineData::Value(other, ..) => {
Err(ShellError::OnlySupportsThisInputType(
"record or table".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
))
}
PipelineData::ExternalStream { .. } => {
Err(ShellError::OnlySupportsThisInputType(
"record or table".into(),
"raw data".into(),
head,
// This line requires the PipelineData::Empty and PipelineData::ListStream matches above.
input
PipelineData::Value(other, ..) => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "record or table".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
}),
PipelineData::ExternalStream { .. } => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "record or table".into(),
wrong_type: "raw data".into(),
dst_span: head,
src_span: input
.span()
.expect("PipelineData::ExternalStream had no span"),
))
}
}),
}
}

37
crates/nu-command/src/filters/first.rs
View File

@ -142,13 +142,12 @@ fn first_helper(
}
// Propagate errors by explicitly matching them before the final case.
Value::Error { error } => Err(error),
other => Err(ShellError::OnlySupportsThisInputType(
"list, binary or range".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
)),
other => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "list, binary or range".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
}),
},
PipelineData::ListStream(mut ls, metadata) => {
if return_single_element {
@ -164,18 +163,18 @@ fn first_helper(
.set_metadata(metadata))
}
}
PipelineData::ExternalStream { span, .. } => Err(ShellError::OnlySupportsThisInputType(
"list, binary or range".into(),
"raw data".into(),
head,
span,
)),
PipelineData::Empty => Err(ShellError::OnlySupportsThisInputType(
"list, binary or range".into(),
"null".into(),
call.head,
call.head, // TODO: make PipelineData::Empty spanned, so that the span can be used here.
)),
PipelineData::ExternalStream { span, .. } => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "list, binary or range".into(),
wrong_type: "raw data".into(),
dst_span: head,
src_span: span,
}),
PipelineData::Empty => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "list, binary or range".into(),
wrong_type: "null".into(),
dst_span: call.head,
src_span: call.head,
}),
}
}
#[cfg(test)]

13
crates/nu-command/src/filters/flatten.rs
View File

@ -172,13 +172,12 @@ fn flat_value(columns: &[CellPath], item: &Value, _name_tag: Span, all: bool) ->
Value::Error { .. } => return vec![item.clone()],
other => {
return vec![Value::Error {
error: ShellError::OnlySupportsThisInputType(
"record".into(),
other.get_type().to_string(),
_name_tag,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "record".into(),
wrong_type: other.get_type().to_string(),
dst_span: _name_tag,
src_span: other.expect_span(),
},
}];
}
};

25
crates/nu-command/src/filters/lines.rs
View File

@ -113,12 +113,12 @@ impl Command for Lines {
match val {
// Propagate existing errors
Value::Error { error } => Err(error),
_ => Err(ShellError::OnlySupportsThisInputType(
"string or raw data".into(),
val.get_type().to_string(),
head,
val.expect_span(),
)),
_ => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "string or raw data".into(),
wrong_type: val.get_type().to_string(),
dst_span: head,
src_span: val.expect_span(),
}),
}
}
PipelineData::ExternalStream { stdout: None, .. } => Ok(PipelineData::empty()),
@ -234,13 +234,12 @@ impl Iterator for RawStreamLinesAdapter {
// Propagate errors by explicitly matching them before the final case.
Value::Error { error } => return Some(Err(error)),
other => {
return Some(Err(ShellError::OnlySupportsThisInputType(
"string".into(),
other.get_type().to_string(),
self.span,
// This line requires the Value::Error match above.
other.expect_span(),
)));
return Some(Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: other.get_type().to_string(),
dst_span: self.span,
src_span: other.expect_span(),
}));
}
}
}

21
crates/nu-command/src/filters/merge.rs
View File

@ -174,17 +174,18 @@ repeating this process with row 1, and so on."#
val.span()?
};
Err(ShellError::PipelineMismatch(
"input, and argument, to be both record or both table".to_string(),
call.head,
span,
))
Err(ShellError::PipelineMismatch {
exp_input_type: "input, and argument, to be both record or both table"
.to_string(),
dst_span: call.head,
src_span: span,
})
}
_ => Err(ShellError::PipelineMismatch(
"input, and argument, to be both record or both table".to_string(),
call.head,
Span::new(call.head.start, call.head.start),
)),
_ => Err(ShellError::PipelineMismatch {
exp_input_type: "input, and argument, to be both record or both table".to_string(),
dst_span: call.head,
src_span: Span::new(call.head.start, call.head.start),
}),
}
}
}

10
crates/nu-command/src/filters/move_.rs
View File

@ -184,11 +184,11 @@ impl Command for Move {
call.head,
)?
.into_pipeline_data()),
_ => Err(ShellError::PipelineMismatch(
"record or table".to_string(),
call.head,
Span::new(call.head.start, call.head.start),
)),
_ => Err(ShellError::PipelineMismatch {
exp_input_type: "record or table".to_string(),
dst_span: call.head,
src_span: Span::new(call.head.start, call.head.start),
}),
}
}
}

13
crates/nu-command/src/filters/rename.rs
View File

@ -183,13 +183,12 @@ fn rename(
// Propagate errors by explicitly matching them before the final case.
Value::Error { .. } => item.clone(),
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"record".into(),
other.get_type().to_string(),
head_span,
// This line requires the Value::Error match above.
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "record".into(),
wrong_type: other.get_type().to_string(),
dst_span: head_span,
src_span: other.expect_span(),
},
},
},
engine_state.ctrlc.clone(),

37
crates/nu-command/src/filters/take/take_.rs
View File

@ -74,32 +74,31 @@ impl Command for Take {
.set_metadata(metadata)),
// Propagate errors by explicitly matching them before the final case.
Value::Error { error } => Err(error),
other => Err(ShellError::OnlySupportsThisInputType(
"list, binary or range".into(),
other.get_type().to_string(),
call.head,
// This line requires the Value::Error match above.
other.expect_span(),
)),
other => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "list, binary or range".into(),
wrong_type: other.get_type().to_string(),
dst_span: call.head,
src_span: other.expect_span(),
}),
},
PipelineData::ListStream(ls, metadata) => Ok(ls
.take(rows_desired)
.into_pipeline_data(ctrlc)
.set_metadata(metadata)),
PipelineData::ExternalStream { span, .. } => {
Err(ShellError::OnlySupportsThisInputType(
"list, binary or range".into(),
"raw data".into(),
call.head,
span,
))
Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "list, binary or range".into(),
wrong_type: "raw data".into(),
dst_span: call.head,
src_span: span,
})
}
PipelineData::Empty => Err(ShellError::OnlySupportsThisInputType(
"list, binary or range".into(),
"null".into(),
call.head,
call.head, // TODO: make PipelineData::Empty spanned, so that the span can be used here.
)),
PipelineData::Empty => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "list, binary or range".into(),
wrong_type: "null".into(),
dst_span: call.head,
src_span: call.head,
}),
}
}

42
crates/nu-command/src/filters/values.rs
View File

@ -121,12 +121,12 @@ pub fn get_values<'a>(
}
Value::Error { error } => return Err(error.clone()),
_ => {
return Err(ShellError::OnlySupportsThisInputType(
"record or table".into(),
item.get_type().to_string(),
head,
input_span,
))
return Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "record or table".into(),
wrong_type: item.get_type().to_string(),
dst_span: head,
src_span: input_span,
})
}
}
}
@ -177,26 +177,20 @@ fn values(
}
// Propagate errors
PipelineData::Value(Value::Error { error }, ..) => Err(error),
PipelineData::Value(other, ..) => {
Err(ShellError::OnlySupportsThisInputType(
"record or table".into(),
other.get_type().to_string(),
head,
// This line requires the Value::Error match above.
other.expect_span(),
))
}
PipelineData::ExternalStream { .. } => {
Err(ShellError::OnlySupportsThisInputType(
"record or table".into(),
"raw data".into(),
head,
// This line requires the PipelineData::Empty and PipelineData::ListStream matches above.
input
PipelineData::Value(other, ..) => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "record or table".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
}),
PipelineData::ExternalStream { .. } => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "record or table".into(),
wrong_type: "raw data".into(),
dst_span: head,
src_span: input
.span()
.expect("PipelineData::ExternalStream had no span"),
))
}
}),
}
}

12
crates/nu-command/src/hash/generic_digest.rs
View File

@ -115,12 +115,12 @@ where
};
return Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string or binary".into(),
other.get_type().to_string(),
span,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string or binary".into(),
wrong_type: other.get_type().to_string(),
dst_span: span,
src_span: other.expect_span(),
},
};
}
};

12
crates/nu-command/src/math/abs.rs
View File

@ -68,12 +68,12 @@ fn abs_helper(val: Value, head: Span) -> Value {
},
Value::Error { .. } => val,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/arccos.rs
View File

@ -37,7 +37,7 @@ impl Command for SubCommand {
let use_degrees = call.has_flag("degrees");
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head, use_degrees),
@ -88,12 +88,12 @@ fn operate(value: Value, head: Span, use_degrees: bool) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/arccosh.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -78,12 +78,12 @@ fn operate(value: Value, head: Span) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/arcsin.rs
View File

@ -37,7 +37,7 @@ impl Command for SubCommand {
let use_degrees = call.has_flag("degrees");
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head, use_degrees),
@ -89,12 +89,12 @@ fn operate(value: Value, head: Span, use_degrees: bool) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/arcsinh.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -67,12 +67,12 @@ fn operate(value: Value, head: Span) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/arctan.rs
View File

@ -37,7 +37,7 @@ impl Command for SubCommand {
let use_degrees = call.has_flag("degrees");
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head, use_degrees),
@ -78,12 +78,12 @@ fn operate(value: Value, head: Span, use_degrees: bool) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/arctanh.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -78,12 +78,12 @@ fn operate(value: Value, head: Span) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/ceil.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -64,12 +64,12 @@ fn operate(value: Value, head: Span) -> Value {
},
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/cos.rs
View File

@ -37,7 +37,7 @@ impl Command for SubCommand {
let use_degrees = call.has_flag("degrees");
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head, use_degrees),
@ -88,12 +88,12 @@ fn operate(value: Value, head: Span, use_degrees: bool) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/cosh.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -69,12 +69,12 @@ fn operate(value: Value, head: Span) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/floor.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -64,12 +64,12 @@ fn operate(value: Value, head: Span) -> Value {
},
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/ln.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -78,12 +78,12 @@ fn operate(value: Value, head: Span) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/log.rs
View File

@ -53,7 +53,7 @@ impl Command for SubCommand {
}
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
let base = base.item;
input.map(
@ -118,12 +118,12 @@ fn operate(value: Value, head: Span, base: f64) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/round.rs
View File

@ -45,7 +45,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head, precision_param),
@ -95,12 +95,12 @@ fn operate(value: Value, head: Span, precision: Option<i64>) -> Value {
Value::Int { .. } => value,
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/sin.rs
View File

@ -37,7 +37,7 @@ impl Command for SubCommand {
let use_degrees = call.has_flag("degrees");
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head, use_degrees),
@ -88,12 +88,12 @@ fn operate(value: Value, head: Span, use_degrees: bool) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/sinh.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -69,12 +69,12 @@ fn operate(value: Value, head: Span) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/sqrt.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -73,12 +73,12 @@ fn operate(value: Value, head: Span) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/tan.rs
View File

@ -37,7 +37,7 @@ impl Command for SubCommand {
let use_degrees = call.has_flag("degrees");
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head, use_degrees),
@ -86,12 +86,12 @@ fn operate(value: Value, head: Span, use_degrees: bool) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

14
crates/nu-command/src/math/tanh.rs
View File

@ -35,7 +35,7 @@ impl Command for SubCommand {
let head = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| operate(value, head),
@ -68,12 +68,12 @@ fn operate(value: Value, head: Span) -> Value {
}
Value::Error { .. } => value,
other => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"numeric".into(),
other.get_type().to_string(),
head,
other.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "numeric".into(),
wrong_type: other.get_type().to_string(),
dst_span: head,
src_span: other.expect_span(),
},
},
}
}

2
crates/nu-command/src/math/utils.rs
View File

@ -106,7 +106,7 @@ pub fn calculate(
mf(&new_vals?, span, &name)
}
PipelineData::Value(val, ..) => mf(&[val], span, &name),
PipelineData::Empty { .. } => Err(ShellError::PipelineEmpty(name)),
PipelineData::Empty { .. } => Err(ShellError::PipelineEmpty { dst_span: name }),
val => Err(ShellError::UnsupportedInput(
"Only integers, floats, lists, records or ranges are supported".into(),
"value originates from here".into(),

10
crates/nu-command/src/network/port.rs
View File

@ -79,11 +79,11 @@ fn get_free_port(
// check input range valid.
if start_port > end_port {
return Err(ShellError::InvalidRange(
start_port.to_string(),
end_port.to_string(),
call.head,
));
return Err(ShellError::InvalidRange {
left_flank: start_port.to_string(),
right_flank: end_port.to_string(),
span: call.head,
});
}
// try given port one by one.

24
crates/nu-command/src/network/url/encode.rs
View File

@ -100,12 +100,12 @@ fn action_all(input: &Value, _arg: &CellPathOnlyArgs, head: Span) -> Value {
}
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}
@ -121,12 +121,12 @@ fn action(input: &Value, _arg: &CellPathOnlyArgs, head: Span) -> Value {
}
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

2
crates/nu-command/src/path/basename.rs
View File

@ -69,7 +69,7 @@ impl Command for SubCommand {
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&get_basename, &args, value, head),

2
crates/nu-command/src/path/dirname.rs
View File

@ -73,7 +73,7 @@ impl Command for SubCommand {
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&get_dirname, &args, value, head),

2
crates/nu-command/src/path/exists.rs
View File

@ -63,7 +63,7 @@ If you need to distinguish dirs and files, please use `path type`."#
};
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&exists, &args, value, head),

2
crates/nu-command/src/path/expand.rs
View File

@ -69,7 +69,7 @@ impl Command for SubCommand {
};
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&expand, &args, value, head),

8
crates/nu-command/src/path/join.rs
View File

@ -80,7 +80,7 @@ the output of 'path parse' and 'path split' subcommands."#
handle_value(input.into_value(head), &args, head),
metadata,
)),
PipelineData::Empty { .. } => Err(ShellError::PipelineEmpty(head)),
PipelineData::Empty { .. } => Err(ShellError::PipelineEmpty { dst_span: head }),
_ => Err(ShellError::UnsupportedInput(
"Input value cannot be joined".to_string(),
"value originates from here".into(),
@ -197,7 +197,11 @@ fn join_list(parts: &[Value], head: Span, span: Span, args: &Arguments) -> Value
Value::List { vals, span }
}
Err(_) => Value::Error {
error: ShellError::PipelineMismatch("string or record".into(), head, span),
error: ShellError::PipelineMismatch {
exp_input_type: "string or record".into(),
dst_span: head,
src_span: span,
},
},
}
}

18
crates/nu-command/src/path/mod.rs
View File

@ -93,14 +93,18 @@ fn err_from_value(rest: &Value, name: Span) -> ShellError {
match rest.span() {
Ok(span) => {
if rest.is_nothing() {
ShellError::OnlySupportsThisInputType(
"string, record or list".into(),
"nothing".into(),
name,
span,
)
ShellError::OnlySupportsThisInputType {
exp_input_type: "string, record or list".into(),
wrong_type: "nothing".into(),
dst_span: name,
src_span: span,
}
} else {
ShellError::PipelineMismatch("string, row or list".into(), name, span)
ShellError::PipelineMismatch {
exp_input_type: "string, row or list".into(),
dst_span: name,
src_span: span,
}
}
}
Err(error) => error,

2
crates/nu-command/src/path/parse.rs
View File

@ -71,7 +71,7 @@ On Windows, an extra 'prefix' column is added."#
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&parse, &args, value, head),

2
crates/nu-command/src/path/relative_to.rs
View File

@ -71,7 +71,7 @@ path."#
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&relative_to, &args, value, head),

2
crates/nu-command/src/path/split.rs
View File

@ -56,7 +56,7 @@ impl Command for SubCommand {
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&split, &args, value, head),

2
crates/nu-command/src/path/type.rs
View File

@ -61,7 +61,7 @@ If nothing is found, an empty string will be returned."#
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(head));
return Err(ShellError::PipelineEmpty { dst_span: head });
}
input.map(
move |value| super::operate(&r#type, &args, value, head),

8
crates/nu-command/src/random/decimal.rs
View File

@ -88,11 +88,11 @@ fn decimal(
};
match min.partial_cmp(&max) {
Some(Ordering::Greater) => Err(ShellError::InvalidRange(
min.to_string(),
max.to_string(),
Some(Ordering::Greater) => Err(ShellError::InvalidRange {
left_flank: min.to_string(),
right_flank: max.to_string(),
span,
)),
}),
Some(Ordering::Equal) => Ok(PipelineData::Value(
Value::Float {
val: min,

8
crates/nu-command/src/random/integer.rs
View File

@ -88,11 +88,11 @@ fn integer(
};
match min.partial_cmp(&max) {
Some(Ordering::Greater) => Err(ShellError::InvalidRange(
min.to_string(),
max.to_string(),
Some(Ordering::Greater) => Err(ShellError::InvalidRange {
left_flank: min.to_string(),
right_flank: max.to_string(),
span,
)),
}),
Some(Ordering::Equal) => Ok(PipelineData::Value(Value::Int { val: min, span }, None)),
_ => {
let mut thread_rng = thread_rng();

12
crates/nu-command/src/strings/encode_decode/decode.rs
View File

@ -78,12 +78,12 @@ documentation link at https://docs.rs/encoding_rs/latest/encoding_rs/#statics"#
Value::Binary { val: bytes, .. } => super::encoding::decode(head, encoding, &bytes)
.map(|val| val.into_pipeline_data()),
Value::Error { error } => Err(error),
_ => Err(ShellError::OnlySupportsThisInputType(
"binary".into(),
v.get_type().to_string(),
head,
v.expect_span(),
)),
_ => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "binary".into(),
wrong_type: v.get_type().to_string(),
dst_span: head,
src_span: v.expect_span(),
}),
},
// This should be more precise, but due to difficulties in getting spans
// from PipelineData::ListData, this is as it is.

12
crates/nu-command/src/strings/encode_decode/encode.rs
View File

@ -101,12 +101,12 @@ documentation link at https://docs.rs/encoding_rs/latest/encoding_rs/#statics"#
.map(|val| val.into_pipeline_data())
}
Value::Error { error } => Err(error),
_ => Err(ShellError::OnlySupportsThisInputType(
"string".into(),
v.get_type().to_string(),
head,
v.expect_span(),
)),
_ => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: v.get_type().to_string(),
dst_span: head,
src_span: v.expect_span(),
}),
},
// This should be more precise, but due to difficulties in getting spans
// from PipelineData::ListStream, this is as it is.

25
crates/nu-command/src/strings/format/command.rs
View File

@ -232,12 +232,12 @@ fn format(
}
Value::Error { error } => return Err(error.clone()),
_ => {
return Err(ShellError::OnlySupportsThisInputType(
"record".to_string(),
val.get_type().to_string(),
head_span,
val.expect_span(),
))
return Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "record".to_string(),
wrong_type: val.get_type().to_string(),
dst_span: head_span,
src_span: val.expect_span(),
})
}
}
}
@ -250,13 +250,12 @@ fn format(
// Unwrapping this ShellError is a bit unfortunate.
// Ideally, its Span would be preserved.
Value::Error { error } => Err(error),
_ => Err(ShellError::OnlySupportsThisInputType(
"record".to_string(),
data_as_value.get_type().to_string(),
head_span,
// This line requires the Value::Error match above.
data_as_value.expect_span(),
)),
_ => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "record".to_string(),
wrong_type: data_as_value.get_type().to_string(),
dst_span: head_span,
src_span: data_as_value.expect_span(),
}),
}
}

12
crates/nu-command/src/strings/format/filesize.rs
View File

@ -106,12 +106,12 @@ fn format_value_impl(val: &Value, arg: &Arguments, span: Span) -> Value {
},
Value::Error { .. } => val.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"filesize".into(),
val.get_type().to_string(),
span,
val.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "filesize".into(),
wrong_type: val.get_type().to_string(),
dst_span: span,
src_span: val.expect_span(),
},
},
}
}

26
crates/nu-command/src/strings/parse.rs
View File

@ -204,11 +204,11 @@ fn operate(
}
}
Err(_) => {
return Err(ShellError::PipelineMismatch(
"string".into(),
head,
v.span()?,
))
return Err(ShellError::PipelineMismatch {
exp_input_type: "string".into(),
dst_span: head,
src_span: v.span()?,
})
}
}
}
@ -346,11 +346,11 @@ impl Iterator for ParseStreamer {
&mut self.excess,
),
Err(_) => Some(Value::Error {
error: ShellError::PipelineMismatch(
"string".into(),
self.span,
v.span().unwrap_or(self.span),
),
error: ShellError::PipelineMismatch {
exp_input_type: "string".into(),
dst_span: self.span,
src_span: v.span().unwrap_or(self.span),
},
}),
}
} else {
@ -386,7 +386,11 @@ impl Iterator for ParseStreamerExternal {
&mut self.excess,
),
Err(_) => Some(Value::Error {
error: ShellError::PipelineMismatch("string".into(), self.span, self.span),
error: ShellError::PipelineMismatch {
exp_input_type: "string".into(),
dst_span: self.span,
src_span: self.span,
},
}),
}
} else if let Some(Err(err)) = v {

8
crates/nu-command/src/strings/size.rs
View File

@ -118,7 +118,7 @@ fn size(
let span = call.head;
// This doesn't match explicit nulls
if matches!(input, PipelineData::Empty) {
return Err(ShellError::PipelineEmpty(span));
return Err(ShellError::PipelineEmpty { dst_span: span });
}
input.map(
move |v| {
@ -131,7 +131,11 @@ fn size(
match v.as_string() {
Ok(s) => counter(&s, span),
Err(_) => Value::Error {
error: ShellError::PipelineMismatch("string".into(), span, value_span),
error: ShellError::PipelineMismatch {
exp_input_type: "string".into(),
dst_span: span,
src_span: value_span,
},
},
}
},

6
crates/nu-command/src/strings/split/chars.rs
View File

@ -110,7 +110,11 @@ fn split_chars_helper(v: &Value, name: Span, graphemes: bool) -> Vec<Value> {
}
} else {
vec![Value::Error {
error: ShellError::PipelineMismatch("string".into(), name, v_span),
error: ShellError::PipelineMismatch {
exp_input_type: "string".into(),
dst_span: name,
src_span: v_span,
},
}]
}
}

6
crates/nu-command/src/strings/split/column.rs
View File

@ -182,7 +182,11 @@ fn split_column_helper(
} else {
match v.span() {
Ok(span) => vec![Value::Error {
error: ShellError::PipelineMismatch("string".into(), head, span),
error: ShellError::PipelineMismatch {
exp_input_type: "string".into(),
dst_span: head,
src_span: span,
},
}],
Err(error) => vec![Value::Error { error }],
}

6
crates/nu-command/src/strings/split/row.rs
View File

@ -132,7 +132,11 @@ fn split_row_helper(
}
} else {
vec![Value::Error {
error: ShellError::PipelineMismatch("string".into(), name, v_span),
error: ShellError::PipelineMismatch {
exp_input_type: "string".into(),
dst_span: name,
src_span: v_span,
},
}]
}
}

6
crates/nu-command/src/strings/split/words.rs
View File

@ -185,7 +185,11 @@ fn split_words_helper(
.collect::<Vec<Value>>()
} else {
vec![Value::Error {
error: ShellError::PipelineMismatch("string".into(), span, v_span),
error: ShellError::PipelineMismatch {
exp_input_type: "string".into(),
dst_span: span,
src_span: v_span,
},
}]
}
}

12
crates/nu-command/src/strings/str_/case/capitalize.rs
View File

@ -107,12 +107,12 @@ fn action(input: &Value, head: Span) -> Value {
},
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

12
crates/nu-command/src/strings/str_/case/downcase.rs
View File

@ -119,12 +119,12 @@ fn action(input: &Value, head: Span) -> Value {
},
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

12
crates/nu-command/src/strings/str_/case/mod.rs
View File

@ -69,12 +69,12 @@ where
},
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

12
crates/nu-command/src/strings/str_/case/upcase.rs
View File

@ -86,12 +86,12 @@ fn action(input: &Value, head: Span) -> Value {
},
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

12
crates/nu-command/src/strings/str_/contains.rs
View File

@ -183,12 +183,12 @@ fn action(
),
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

12
crates/nu-command/src/strings/str_/distance.rs
View File

@ -99,12 +99,12 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
}
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

12
crates/nu-command/src/strings/str_/ends_with.rs
View File

@ -98,12 +98,12 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
}
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

24
crates/nu-command/src/strings/str_/index_of.rs
View File

@ -186,12 +186,12 @@ fn action(
}
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}
@ -236,12 +236,12 @@ fn process_range(
}
}
Value::Error { error } => Err(error.clone()),
_ => Err(ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
)),
_ => Err(ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
}),
}?;
let start_index = r.0.parse::<i32>().unwrap_or(0);

12
crates/nu-command/src/strings/str_/length.rs
View File

@ -108,12 +108,12 @@ fn action(input: &Value, arg: &Arguments, head: Span) -> Value {
),
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

12
crates/nu-command/src/strings/str_/replace.rs
View File

@ -216,12 +216,12 @@ fn action(
}
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

12
crates/nu-command/src/strings/str_/reverse.rs
View File

@ -77,12 +77,12 @@ fn action(input: &Value, _arg: &CellPathOnlyArgs, head: Span) -> Value {
},
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
error: ShellError::OnlySupportsThisInputType {
exp_input_type: "string".into(),
wrong_type: input.get_type().to_string(),
dst_span: head,
src_span: input.expect_span(),
},
},
}
}

Some files were not shown because too many files have changed in this diff Show More