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).

crates/cargo-util/src/paths.rs

@@ -510,8 +510,7 @@ fn _remove_file(p: &Path) -> Result<()> {
         }
     }
 
-    Err(err).with_context(|| format!("failed to remove file `{}`", p.display()))?;
-    Ok(())
+    Err(err).with_context(|| format!("failed to remove file `{}`", p.display()))
 }
 
 fn set_not_readonly(p: &Path) -> io::Result<bool> {