cafkafk/seidr
cafkafk/seidr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(link): add LinkError and propagate errors up to runner #14

Merged
cafkafk merged 6 commits from cafk-link-result-refactor into main 2023-10-17 07:09:30 +02:00
Conversation 0 Commits 6 Files changed 1 +1 -4
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a1a52b10f3 - Show all commits

5
src/git.rs
View file

@ -172,10 +172,7 @@ impl From<std::io::Error> for LinkError {
fn handle_file_exists(selff: &Link, tx_path: &Path, rx_path: &Path) -> Result<bool, LinkError> {
match rx_path.read_link() {
Ok(file)
if file.canonicalize().expect("failed to canonicalize file")
== tx_path.canonicalize().expect("failed to canonicalize path") =>
{
Ok(file) if file.canonicalize()? == tx_path.canonicalize()? => {
Err(LinkError::AlreadyLinked(
tx_path.to_string_lossy().to_string(),
rx_path.to_string_lossy().to_string(),