extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-23 00:43:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent mv panic again (#6171)

Browse Source 
Closes #6170

Signed-off-by: nibon7 <nibon7@163.com>
This commit is contained in:
nibon7 2022-07-29 15:00:52 +08:00 committed by GitHub
parent 6b2c7a4c86
commit cf2e9cf481
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/nu-command/src/filesystem/mv.rs
View File

@ -119,7 +119,7 @@ impl Command for Mv {
return Err(ShellError::GenericError( return Err(ShellError::GenericError(
format!( format!(
"Not possible to move {:?} to itself", "Not possible to move {:?} to itself",
filename.file_name().expect("Invalid file name") filename.file_name().unwrap_or(filename.as_os_str())
), ),
"cannot move to itself".into(), "cannot move to itself".into(),
Some(spanned_destination.span), Some(spanned_destination.span),
@ -155,18 +155,17 @@ impl Command for Mv {
if let Err(error) = result { if let Err(error) = result {
Some(Value::Error { error }) Some(Value::Error { error })
} else if verbose { } else if verbose {
let val = if result.expect("Error value when unwrapping mv result") { let val = match result {
format!( Ok(true) => format!(
"moved {:} to {:}", "moved {:} to {:}",
entry.to_string_lossy(), entry.to_string_lossy(),
destination.to_string_lossy() destination.to_string_lossy()
) ),
} else { _ => format!(
format!(
"{:} not moved to {:}", "{:} not moved to {:}",
entry.to_string_lossy(), entry.to_string_lossy(),
destination.to_string_lossy() destination.to_string_lossy()
) ),
}; };
Some(Value::String { val, span }) Some(Value::String { val, span })
} else { } else {