62575c9a4f
Continuation of #8229 and #8326 # 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. # Call to action **Everyone:** Feel free to add review comments if you spot inconsistent use of `ShellError` variants. # User-Facing Changes (None now, end goal more explicit and consistent error messages) # Tests + Formatting (No additional tests needed so far) # Commits (so far) - Remove `ShellError::FeatureNotEnabled` - Name fields on `SE::ExternalNotSupported` - Name field on `SE::InvalidProbability` - Name fields on `SE::NushellFailed` variants - Remove unused `SE::NushellFailedSpannedHelp` - Name field on `SE::VariableNotFoundAtRuntime` - Name fields on `SE::EnvVarNotFoundAtRuntime` - Name fields on `SE::ModuleNotFoundAtRuntime` - Remove usused `ModuleOrOverlayNotFoundAtRuntime` - Name fields on `SE::OverlayNotFoundAtRuntime` - Name field on `SE::NotFound`
129 lines
3.4 KiB
Rust
129 lines
3.4 KiB
Rust
use nu_protocol::{
|
|
ast::Call,
|
|
engine::{EngineState, Stack},
|
|
FromValue, ShellError,
|
|
};
|
|
|
|
use crate::eval_expression;
|
|
|
|
pub trait CallExt {
|
|
fn get_flag<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
name: &str,
|
|
) -> Result<Option<T>, ShellError>;
|
|
|
|
fn rest<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
starting_pos: usize,
|
|
) -> Result<Vec<T>, ShellError>;
|
|
|
|
fn opt<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<Option<T>, ShellError>;
|
|
|
|
fn req<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<T, ShellError>;
|
|
|
|
fn req_parser_info<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<T, ShellError>;
|
|
}
|
|
|
|
impl CallExt for Call {
|
|
fn get_flag<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
name: &str,
|
|
) -> Result<Option<T>, ShellError> {
|
|
if let Some(expr) = self.get_flag_expr(name) {
|
|
let result = eval_expression(engine_state, stack, &expr)?;
|
|
FromValue::from_value(&result).map(Some)
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
}
|
|
|
|
fn rest<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
starting_pos: usize,
|
|
) -> Result<Vec<T>, ShellError> {
|
|
let mut output = vec![];
|
|
|
|
for expr in self.positional_iter().skip(starting_pos) {
|
|
let result = eval_expression(engine_state, stack, expr)?;
|
|
output.push(FromValue::from_value(&result)?);
|
|
}
|
|
|
|
Ok(output)
|
|
}
|
|
|
|
fn opt<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<Option<T>, ShellError> {
|
|
if let Some(expr) = self.positional_nth(pos) {
|
|
let result = eval_expression(engine_state, stack, expr)?;
|
|
FromValue::from_value(&result).map(Some)
|
|
} else {
|
|
Ok(None)
|
|
}
|
|
}
|
|
|
|
fn req<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<T, ShellError> {
|
|
if let Some(expr) = self.positional_nth(pos) {
|
|
let result = eval_expression(engine_state, stack, expr)?;
|
|
FromValue::from_value(&result)
|
|
} else if self.positional_len() == 0 {
|
|
Err(ShellError::AccessEmptyContent { span: self.head })
|
|
} else {
|
|
Err(ShellError::AccessBeyondEnd {
|
|
max_idx: self.positional_len() - 1,
|
|
span: self.head,
|
|
})
|
|
}
|
|
}
|
|
|
|
fn req_parser_info<T: FromValue>(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
pos: usize,
|
|
) -> Result<T, ShellError> {
|
|
if let Some(expr) = self.parser_info_nth(pos) {
|
|
let result = eval_expression(engine_state, stack, expr)?;
|
|
FromValue::from_value(&result)
|
|
} else if self.parser_info.is_empty() {
|
|
Err(ShellError::AccessEmptyContent { span: self.head })
|
|
} else {
|
|
Err(ShellError::AccessBeyondEnd {
|
|
max_idx: self.parser_info.len() - 1,
|
|
span: self.head,
|
|
})
|
|
}
|
|
}
|
|
}
|