diff --git a/cli/src/commit_templater.rs b/cli/src/commit_templater.rs
index cfae822f3..58d052351 100644
--- a/cli/src/commit_templater.rs
+++ b/cli/src/commit_templater.rs
@@ -1029,6 +1029,7 @@ impl RefNamesIndex {
 
     #[allow(unknown_lints)] // XXX FIXME (aseipp): nightly bogons; re-test this occasionally
     #[allow(clippy::manual_unwrap_or_default)]
+    #[allow(clippy::manual_unwrap_or)] // https://github.com/rust-lang/rust-clippy/issues/13018
     pub fn get(&self, id: &CommitId) -> &[Rc<RefName>] {
         if let Some(names) = self.index.get(id) {
             names
diff --git a/lib/src/workspace.rs b/lib/src/workspace.rs
index 624a80d93..4cd5c8a55 100644
--- a/lib/src/workspace.rs
+++ b/lib/src/workspace.rs
@@ -283,9 +283,8 @@ impl Workspace {
             let workspace = Workspace::new(workspace_root, working_copy, repo_loader)?;
             Ok((workspace, repo))
         })()
-        .map_err(|err| {
+        .inspect_err(|_err| {
             let _ = std::fs::remove_dir_all(jj_dir);
-            err
         })
     }