Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-28 05:53:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent mv panic (#6158)

Browse source 
Signed-off-by: nibon7 <nibon7@163.com>
This commit is contained in:
nibon7 2022-07-28 13:15:02 +08:00 committed by GitHub
parent e049ca8ebf
commit 2ea209bcc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
crates/nu-command/src/filesystem/mv.rs
View file

@ -84,7 +84,7 @@ impl Command for Mv {
let ctrlc = engine_state.ctrlc.clone(); let ctrlc = engine_state.ctrlc.clone();
let path = current_dir(engine_state, stack).expect("Failed current_dir"); let path = current_dir(engine_state, stack)?;
let span = call.head; let span = call.head;
@ -141,7 +141,7 @@ impl Command for Mv {
let err = ShellError::GenericError( let 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),
@ -178,18 +178,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 {