Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-14 22:24:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix error propagration across hash commands (#493)

Browse source
This commit is contained in:
Benoît Cortier 2021-12-14 14:49:48 -05:00 committed by GitHub
parent a5c1dd0da5
commit a41ae72bc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/nu-command/src/hash/generic_digest.rs
View file

@ -1,7 +1,7 @@
use nu_engine::CallExt; use nu_engine::CallExt;
use nu_protocol::ast::{Call, CellPath}; use nu_protocol::ast::{Call, CellPath};
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Value}; use nu_protocol::{Example, PipelineData, ShellError, Signature, SyntaxShape, Value};
use std::marker::PhantomData; use std::marker::PhantomData;
pub trait HashDigest: digest::Digest + Clone { pub trait HashDigest: digest::Digest + Clone {
@ -90,6 +90,11 @@ where
Value::String { val, span } => (val.as_bytes(), *span), Value::String { val, span } => (val.as_bytes(), *span),
Value::Binary { val, span } => (val.as_slice(), *span), Value::Binary { val, span } => (val.as_slice(), *span),
other => { other => {
let span = match input.span() {
Ok(span) => span,
Err(error) => return Value::Error { error },
};
return Value::Error { return Value::Error {
error: ShellError::UnsupportedInput( error: ShellError::UnsupportedInput(
format!( format!(
@ -97,7 +102,7 @@ where
other.get_type(), other.get_type(),
D::name() D::name()
), ),
input.span().unwrap_or_else(|_| Span::unknown()), span,
), ),
}; };
} }