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

Make str more strict. (#2173)

Browse Source
This commit is contained in:
Andrés N. Robalino
2020-07-14 10:04:00 -05:00
committed by GitHub
parent f2c4d22739
commit e9313a61af
7 changed files with 105 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/nu-cli/src/commands/str_/to_datetime.rs
View File

@ -123,7 +123,13 @@ fn action(
let out = match DateTime::parse_from_str(s, dt) {
Ok(d) => UntaggedValue::date(d),
Err(_) => UntaggedValue::string(s),
Err(reason) => {
return Err(ShellError::labeled_error(
"could not parse as datetime",
reason.to_string(),
tag.into().span,
))
}
};
Ok(out.into_value(tag))
@ -166,4 +172,15 @@ mod tests {
_ => panic!("Didn't convert to date"),
}
}
#[test]
fn communicates_parsing_error_given_an_invalid_datetimelike_string() {
let date_str = string("16.11.1984 8:00 am Oops0000");
let fmt_options = DatetimeFormat("%d.%m.%Y %H:%M %P %z".to_string());
let actual = action(&date_str, &fmt_options, Tag::unknown());
assert!(actual.is_err());
}
}

17
crates/nu-cli/src/commands/str_/to_decimal.rs
View File

@ -101,7 +101,13 @@ fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
let other = s.trim();
let out = match BigDecimal::from_str(other) {
Ok(v) => UntaggedValue::decimal(v),
Err(_) => UntaggedValue::string(s),
Err(reason) => {
return Err(ShellError::labeled_error(
"could not parse as decimal",
reason.to_string(),
tag.into().span,
))
}
};
Ok(out.into_value(tag))
}
@ -138,4 +144,13 @@ mod tests {
let actual = action(&word, Tag::unknown()).unwrap();
assert_eq!(actual, expected);
}
#[test]
fn communicates_parsing_error_given_an_invalid_decimallike_string() {
let decimal_str = string("11.6anra");
let actual = action(&decimal_str, Tag::unknown());
assert!(actual.is_err());
}
}

17
crates/nu-cli/src/commands/str_/to_integer.rs
View File

@ -101,7 +101,13 @@ fn action(input: &Value, tag: impl Into<Tag>) -> Result<Value, ShellError> {
let other = s.trim();
let out = match BigInt::from_str(other) {
Ok(v) => UntaggedValue::int(v),
Err(_) => UntaggedValue::string(s),
Err(reason) => {
return Err(ShellError::labeled_error(
"could not parse as an integer",
reason.to_string(),
tag.into().span,
))
}
};
Ok(out.into_value(tag))
}
@ -137,4 +143,13 @@ mod tests {
let actual = action(&word, Tag::unknown()).unwrap();
assert_eq!(actual, expected);
}
#[test]
fn communicates_parsing_error_given_an_invalid_integerlike_string() {
let integer_str = string("36anra");
let actual = action(&integer_str, Tag::unknown());
assert!(actual.is_err());
}
}