rhg: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067)

rhg: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067)

Differential Revision: https://phab.mercurial-scm.org/D9109

--- a/rust/rhg/src/commands/cat.rs	Mon Sep 28 16:52:35 2020 +0200
+++ b/rust/rhg/src/commands/cat.rs	Mon Sep 28 16:54:35 2020 +0200
@@ -40,9 +40,9 @@
             let normalized = cwd.join(&file);
             let stripped = normalized
                 .strip_prefix(&root)
-                .map_err(|_| CommandErrorKind::Abort(None))?;
+                .or(Err(CommandErrorKind::Abort(None)))?;
             let hg_file = HgPathBuf::try_from(stripped.to_path_buf())
-                .map_err(|_| CommandErrorKind::Abort(None))?;
+                .or(Err(CommandErrorKind::Abort(None)))?;
             files.push(hg_file);
         }