extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-13 15:57:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

update miette and switch to GenericErrors (#5222)

Browse Source
This commit is contained in:
Kat Marchán
2022-04-18 05:34:10 -07:00
committed by GitHub
parent cf65f77b02
commit 1314a87cb0
141 changed files with 1569 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
crates/nu-command/src/generators/seq.rs
View File

@ -124,10 +124,12 @@ fn seq(
let widths = call.has_flag("widths");
if rest_nums.is_empty() {
return Err(ShellError::SpannedLabeledError(
return Err(ShellError::GenericError(
"seq requires some parameters".into(),
"needs parameter".into(),
call.head,
Some(call.head),
None,
Vec::new(),
));
}
@ -142,10 +144,12 @@ fn seq(
} else {
let vec_s: Vec<char> = s.item.chars().collect();
if vec_s.is_empty() {
return Err(ShellError::SpannedLabeledError(
return Err(ShellError::GenericError(
"Expected a single separator char from --separator".into(),
"requires a single character string input".into(),
s.span,
Some(s.span),
None,
Vec::new(),
));
};
vec_s.iter().collect()
@ -165,10 +169,12 @@ fn seq(
} else {
let vec_t: Vec<char> = t.item.chars().collect();
if vec_t.is_empty() {
return Err(ShellError::SpannedLabeledError(
return Err(ShellError::GenericError(
"Expected a single terminator char from --terminator".into(),
"requires a single character string input".into(),
t.span,
Some(t.span),
None,
Vec::new(),
));
};
vec_t.iter().collect()
@ -228,7 +234,15 @@ pub fn run_seq(
padding = dec;
match parse_float(slice) {
Ok(n) => n,
Err(s) => return Err(ShellError::LabeledError(s, "error parsing float".into())),
Err(s) => {
return Err(ShellError::GenericError(
s,
"".to_string(),
None,
Some("error parsing float".into()),
Vec::new(),
))
}
}
} else {
1.0
@ -241,7 +255,15 @@ pub fn run_seq(
padding = cmp::max(padding, dec);
match parse_float(slice) {
Ok(n) => n,
Err(s) => return Err(ShellError::LabeledError(s, "error parsing float".into())),
Err(s) => {
return Err(ShellError::GenericError(
s,
"".to_string(),
None,
Some("error parsing float".into()),
Vec::new(),
))
}
}
} else {
1.0
@ -252,7 +274,13 @@ pub fn run_seq(
match parse_float(slice) {
Ok(n) => n,
Err(s) => {
return Err(ShellError::LabeledError(s, "error parsing float".into()));
return Err(ShellError::GenericError(
s,
"".to_string(),
None,
Some("error parsing float".into()),
Vec::new(),
));
}
}
};

50
crates/nu-command/src/generators/seq_date.rs
View File

@ -155,10 +155,12 @@ impl Command for SeqDate {
} else {
let vec_s: Vec<char> = s.item.chars().collect();
if vec_s.is_empty() {
return Err(ShellError::SpannedLabeledError(
return Err(ShellError::GenericError(
"Expected a single separator char from --separator".to_string(),
"requires a single character string input".to_string(),
s.span,
Some(s.span),
None,
Vec::new(),
));
};
vec_s.iter().collect()
@ -231,10 +233,12 @@ pub fn run_seq_dates(
.expect("unable to change increment to i64");
if step_size == 0 {
return Err(ShellError::SpannedLabeledError(
return Err(ShellError::GenericError(
"increment cannot be 0".to_string(),
"increment cannot be 0".to_string(),
increment.span()?,
Some(increment.span()?),
None,
Vec::new(),
));
}
@ -242,9 +246,12 @@ pub fn run_seq_dates(
Some(i) => match i.as_string() {
Ok(v) => v,
Err(e) => {
return Err(ShellError::LabeledError(
return Err(ShellError::GenericError(
e.to_string(),
"error with input_format as_string".to_string(),
"".to_string(),
None,
Some("error with input_format as_string".to_string()),
Vec::new(),
));
}
},
@ -255,9 +262,12 @@ pub fn run_seq_dates(
Some(i) => match i.as_string() {
Ok(v) => v,
Err(e) => {
return Err(ShellError::LabeledError(
return Err(ShellError::GenericError(
e.to_string(),
"error with output_format as_string".to_string(),
"".to_string(),
None,
Some("error with output_format as_string".to_string()),
Vec::new(),
));
}
},
@ -268,10 +278,12 @@ pub fn run_seq_dates(
Some(d) => match parse_date_string(&d, &in_format) {
Ok(nd) => nd,
Err(e) => {
return Err(ShellError::SpannedLabeledError(
return Err(ShellError::GenericError(
e.to_string(),
"Failed to parse date".to_string(),
Span::test_data(),
Some(Span::test_data()),
None,
Vec::new(),
))
}
},
@ -282,10 +294,12 @@ pub fn run_seq_dates(
Some(d) => match parse_date_string(&d, &in_format) {
Ok(nd) => nd,
Err(e) => {
return Err(ShellError::SpannedLabeledError(
return Err(ShellError::GenericError(
e.to_string(),
"Failed to parse date".to_string(),
Span::test_data(),
Some(Span::test_data()),
None,
Vec::new(),
))
}
},
@ -307,10 +321,12 @@ pub fn run_seq_dates(
end_date = match start_date.checked_add_signed(Duration::days(days_to_output)) {
Some(date) => date,
None => {
return Err(ShellError::SpannedLabeledError(
return Err(ShellError::GenericError(
"integer value too large".to_string(),
"integer value too large".to_string(),
Span::test_data(),
Some(Span::test_data()),
None,
Vec::new(),
));
}
}
@ -327,10 +343,12 @@ pub fn run_seq_dates(
let mut next = start_date;
if is_out_of_range(next) {
return Err(ShellError::SpannedLabeledError(
return Err(ShellError::GenericError(
"date is out of range".to_string(),
"date is out of range".to_string(),
Span::test_data(),
Some(Span::test_data()),
None,
Vec::new(),
));
}