Skip to content

Replace unwrap with expect (symlink.rs) #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
selvmaya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace unwrap with expect (symlink.rs) #152

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/symlinks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,9 @@ pub fn add_cmd(
let Some(group_files) = group else { return };

for file in group_files {
let target_file = file.to_target_path().unwrap();
let target_file = file
.to_target_path()
.expect("Unable to convert file to a target path?");

let deleted_file = if adopt { &file.path } else { &target_file };

Expand All @@ -612,9 +614,9 @@ pub fn add_cmd(
t!("dry-run.removing_x", x = deleted_file.display()).red()
);
} else if deleted_file.is_dir() {
fs::remove_dir_all(deleted_file).unwrap();
fs::remove_dir_all(deleted_file).expect("Unable to delete directory?");
} else if deleted_file.is_file() {
fs::remove_file(deleted_file).unwrap();
fs::remove_file(deleted_file).expect("Unable to remove file?");
}

if adopt {
Expand All @@ -629,7 +631,7 @@ pub fn add_cmd(
.yellow()
);
} else {
fs::rename(target_file, &file.path).unwrap();
fs::rename(target_file, &file.path).expect("Unable to rename (replace) file?");
}
}
}
Expand Down