changeset 45604 | db11f8f39caf |
parent 45542 | 33ded2d3f4fc |
child 45937 | 2ad2745e0be9 |
--- 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); }