This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8867

rhg: simplify `FindRootError` handling
ClosedPublic

Authored by acezar on Aug 3 2020, 10:26 AM.

Details

Reviewers
Alphare
indygreg
Group Reviewers
hg-reviewers
Commits
rHG5dbf875b3275: rhg: simplify `FindRootError` handling

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.Aug 3 2020, 10:26 AM
Alphare accepted this revision.Aug 3 2020, 11:11 AM
Alphare added a subscriber: Alphare.

Typo in the title: s/simply/simplify/

I suppose a more explicit title would be welcome like "leverage From trait for error handling for cleaner logic", or something.

acezar retitled this revision from rhg: simply `FindRootError` handling to rhg: simplify `FindRootError` handling.Aug 4 2020, 4:28 AM
acezar updated this revision to Diff 22244.
indygreg accepted this revision.Aug 8 2020, 4:03 PM
This revision is now accepted and ready to land.Aug 8 2020, 4:03 PM
acezar added a commit: rHG5dbf875b3275: rhg: simplify `FindRootError` handling.Aug 8 2020, 4:30 PM
Closed by commit rHG5dbf875b3275: rhg: simplify `FindRootError` handling (authored by acezar). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/root.rs (14 lines)
Mrust/rhg/src/error.rs (14 lines)

Diff 22362

rust/rhg/src/commands/root.rs

use crate::commands::Command; use crate::commands::Command;
use crate::error::{CommandError, CommandErrorKind}; use crate::error::CommandError;
use crate::ui::Ui; use crate::ui::Ui;
use hg::operations::{FindRoot, FindRootErrorKind}; use hg::operations::FindRoot;
use hg::utils::files::get_bytes_from_path; use hg::utils::files::get_bytes_from_path;
pub const HELP_TEXT: &str = " pub const HELP_TEXT: &str = "
Print the root directory of the current repository. Print the root directory of the current repository.
Returns 0 on success. Returns 0 on success.
"; ";
pub struct RootCommand<'a> { pub struct RootCommand<'a> {
ui: &'a Ui, ui: &'a Ui,
} }
impl<'a> RootCommand<'a> { impl<'a> RootCommand<'a> {
pub fn new(ui: &'a Ui) -> Self { pub fn new(ui: &'a Ui) -> Self {
RootCommand { ui } RootCommand { ui }
} }
} }
impl<'a> Command<'a> for RootCommand<'a> { impl<'a> Command<'a> for RootCommand<'a> {
fn run(&self) -> Result<(), CommandError> { fn run(&self) -> Result<(), CommandError> {
let path_buf = let path_buf = FindRoot::new().run()?;
FindRoot::new().run().map_err(|err| match err.kind {
FindRootErrorKind::RootNotFound(path) => {
CommandErrorKind::RootNotFound(path)
}
FindRootErrorKind::GetCurrentDirError(e) => {
CommandErrorKind::CurrentDirNotFound(e)
}
})?;
let bytes = get_bytes_from_path(path_buf); let bytes = get_bytes_from_path(path_buf);
// TODO use formating macro // TODO use formating macro
self.ui.write_stdout(&[bytes.as_slice(), b"\n"].concat())?; self.ui.write_stdout(&[bytes.as_slice(), b"\n"].concat())?;
Ok(()) Ok(())
} }
} }

rust/rhg/src/error.rs

use crate::exitcode; use crate::exitcode;
use crate::ui::UiError; use crate::ui::UiError;
use hg::operations::{FindRootError, FindRootErrorKind};
use hg::utils::files::get_bytes_from_path; use hg::utils::files::get_bytes_from_path;
use std::convert::From; use std::convert::From;
use std::path::PathBuf; use std::path::PathBuf;
/// The kind of command error /// The kind of command error
#[derive(Debug)] #[derive(Debug)]
pub enum CommandErrorKind { pub enum CommandErrorKind {
/// The root of the repository cannot be found /// The root of the repository cannot be found
CommandError { CommandError {
kind: match error { kind: match error {
UiError::StdoutError(_) => CommandErrorKind::StdoutError, UiError::StdoutError(_) => CommandErrorKind::StdoutError,
UiError::StderrError(_) => CommandErrorKind::StderrError, UiError::StderrError(_) => CommandErrorKind::StderrError,
}, },
} }
} }
} }
impl From<FindRootError> for CommandError {
fn from(err: FindRootError) -> Self {
match err.kind {
FindRootErrorKind::RootNotFound(path) => CommandError {
kind: CommandErrorKind::RootNotFound(path),
},
FindRootErrorKind::GetCurrentDirError(e) => CommandError {
kind: CommandErrorKind::CurrentDirNotFound(e),
},
}
}
}