This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9109

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

Authored by acezar on Sep 28 2020, 10:49 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdb11f8f39caf: rhg: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

acezar created this revision.Sep 28 2020, 10:49 AM
Antoine cezar <acezar@chwitlabs.fr> added a commit: rHGdb11f8f39caf: rhg: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067).Sep 29 2020, 1:52 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGdb11f8f39caf: rhg: use `.or(Err(Error))` not `.map_err(|_| Error)` (D9100#inline-15067) (authored by Antoine cezar <acezar@chwitlabs.fr>). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/cat.rs (4 lines)

Diff 22938

rust/rhg/src/commands/cat.rs

let cwd = std::env::current_dir() let cwd = std::env::current_dir()
.or_else(|e| Err(CommandErrorKind::CurrentDirNotFound(e)))?; .or_else(|e| Err(CommandErrorKind::CurrentDirNotFound(e)))?;
let mut files = vec![]; let mut files = vec![];
for file in self.files.iter() { for file in self.files.iter() {
let normalized = cwd.join(&file); let normalized = cwd.join(&file);
let stripped = normalized let stripped = normalized
.strip_prefix(&root) .strip_prefix(&root)
.map_err(|_| CommandErrorKind::Abort(None))?; .or(Err(CommandErrorKind::Abort(None)))?;
let hg_file = HgPathBuf::try_from(stripped.to_path_buf()) let hg_file = HgPathBuf::try_from(stripped.to_path_buf())
.map_err(|_| CommandErrorKind::Abort(None))?; .or(Err(CommandErrorKind::Abort(None)))?;
files.push(hg_file); files.push(hg_file);
} }
match self.rev { match self.rev {
Some(rev) => { Some(rev) => {
let mut operation = CatRev::new(&root, rev, &files) let mut operation = CatRev::new(&root, rev, &files)
.map_err(|e| map_rev_error(rev, e))?; .map_err(|e| map_rev_error(rev, e))?;
let data = let data =