Skip to content

Commit 1570666

Browse files
committed
Auto merge of #13706 - WaffleLapkin:don't-the-err, r=epage
Don't depend on `?` affecting type inference in weird ways This is likely to stop working in the future versions of Rust, see rust-lang/rust#122412 (comment).
2 parents a9a0746 + 898969e commit 1570666

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

crates/cargo-util/src/paths.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,7 @@ fn _remove_file(p: &Path) -> Result<()> {
510510
}
511511
}
512512

513-
Err(err).with_context(|| format!("failed to remove file `{}`", p.display()))?;
514-
Ok(())
513+
Err(err).with_context(|| format!("failed to remove file `{}`", p.display()))
515514
}
516515

517516
fn set_not_readonly(p: &Path) -> io::Result<bool> {

0 commit comments

Comments
 (0)