comparison rust/rhg/src/commands/cat.rs @ 45604:db11f8f39caf

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

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

45603:be951ca95b08

        let mut files = vec![];
        for file in self.files.iter() {
            let normalized = cwd.join(&file);
            let stripped = normalized
                .strip_prefix(&root)
                .map_err(|_| CommandErrorKind::Abort(None))?;
            let hg_file = HgPathBuf::try_from(stripped.to_path_buf())
                .map_err(|_| CommandErrorKind::Abort(None))?;
            files.push(hg_file);
        }

        match self.rev {
            Some(rev) => {

45604:db11f8f39caf

        let mut files = vec![];
        for file in self.files.iter() {
            let normalized = cwd.join(&file);
            let stripped = normalized
                .strip_prefix(&root)
                .or(Err(CommandErrorKind::Abort(None)))?;
            let hg_file = HgPathBuf::try_from(stripped.to_path_buf())
                .or(Err(CommandErrorKind::Abort(None)))?;
            files.push(hg_file);
        }

        match self.rev {
            Some(rev) => {