holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trim spaces when converting strings to ints (#6105)

Browse Source
This commit is contained in:
Darren Schroeder 2022-07-23 09:23:04 -05:00 committed by GitHub
parent 7d46177cf3
commit 388ff78a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,6 +273,7 @@ fn convert_int(input: &Value, head: Span, radix: u32) -> Value {
let i = match input { let i = match input {
Value::Int { val, .. } => val.to_string(), Value::Int { val, .. } => val.to_string(),
Value::String { val, .. } => { Value::String { val, .. } => {
let val = val.trim();
if val.starts_with("0x") // hex if val.starts_with("0x") // hex
|| val.starts_with("0b") // binary || val.starts_with("0b") // binary
|| val.starts_with("0o") || val.starts_with("0o")
@ -309,10 +310,10 @@ fn convert_int(input: &Value, head: Span, radix: u32) -> Value {
} }
} }
}; };
match i64::from_str_radix(&i, radix) { match i64::from_str_radix(i.trim(), radix) {
Ok(n) => Value::Int { val: n, span: head }, Ok(n) => Value::Int { val: n, span: head },
Err(_reason) => Value::Error { Err(_reason) => Value::Error {
error: ShellError::CantConvert("int".to_string(), "string".to_string(), head, None), error: ShellError::CantConvert("string".to_string(), "int".to_string(), head, None),
}, },
} }
} }