( )⚙ D12174 rust: remove unused `StatusError::IO` enum variant

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12174

rust: remove unused `StatusError::IO` enum variant
ClosedPublic

Authored by SimonSapin on Feb 14 2022, 1:00 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG6e930bc45aeb: rust: remove unused `StatusError::IO` enum variant
Summary

All io::Error cases are now handled through PatternFileWarning or BadMatch

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

SimonSapin created this revision.Feb 14 2022, 1:00 PM
Alphare accepted this revision.Feb 15 2022, 4:35 AM
This revision is now accepted and ready to land.Feb 15 2022, 4:35 AM
SimonSapin added a commit: rHG6e930bc45aeb: rust: remove unused `StatusError::IO` enum variant.Feb 15 2022, 4:43 AM
Closed by commit rHG6e930bc45aeb: rust: remove unused `StatusError::IO` enum variant (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 32173

rust/hg-core/src/dirstate/status.rs

#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)] #[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
pub struct StatusPath<'a> { pub struct StatusPath<'a> {
pub path: HgPathCow<'a>, pub path: HgPathCow<'a>,
pub copy_source: Option<HgPathCow<'a>>, pub copy_source: Option<HgPathCow<'a>>,
} }
#[derive(Debug, derive_more::From)] #[derive(Debug, derive_more::From)]
pub enum StatusError { pub enum StatusError {
/// Generic IO error
IO(std::io::Error),
/// An invalid path that cannot be represented in Mercurial was found /// An invalid path that cannot be represented in Mercurial was found
Path(HgPathError), Path(HgPathError),
/// An invalid "ignore" pattern was found /// An invalid "ignore" pattern was found
Pattern(PatternError), Pattern(PatternError),
/// Corrupted dirstate /// Corrupted dirstate
DirstateV2ParseError(DirstateV2ParseError), DirstateV2ParseError(DirstateV2ParseError),
} }
pub type StatusResult<T> = Result<T, StatusError>; pub type StatusResult<T> = Result<T, StatusError>;
impl fmt::Display for StatusError { impl fmt::Display for StatusError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self { match self {
StatusError::IO(error) => error.fmt(f),
StatusError::Path(error) => error.fmt(f), StatusError::Path(error) => error.fmt(f),
StatusError::Pattern(error) => error.fmt(f), StatusError::Pattern(error) => error.fmt(f),
StatusError::DirstateV2ParseError(_) => { StatusError::DirstateV2ParseError(_) => {
f.write_str("dirstate-v2 parse error") f.write_str("dirstate-v2 parse error")
} }
} }
} }
} }

rust/hg-cpython/src/dirstate/status.rs

// status.rs // status.rs
// //
// Copyright 2019, Raphaël Gomès <rgomes@octobus.net> // Copyright 2019, Raphaël Gomès <rgomes@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
//! Bindings for the `hg::status` module provided by the //! Bindings for the `hg::status` module provided by the
//! `hg-core` crate. From Python, this will be seen as //! `hg-core` crate. From Python, this will be seen as
//! `rustext.dirstate.status`. //! `rustext.dirstate.status`.
use crate::{dirstate::DirstateMap, exceptions::FallbackError}; use crate::{dirstate::DirstateMap, exceptions::FallbackError};
use cpython::exc::OSError;
use cpython::{ use cpython::{
exc::ValueError, ObjectProtocol, PyBytes, PyErr, PyList, PyObject, exc::ValueError, ObjectProtocol, PyBytes, PyErr, PyList, PyObject,
PyResult, PyTuple, Python, PythonObject, ToPyObject, PyResult, PyTuple, Python, PythonObject, ToPyObject,
}; };
use hg::dirstate::status::StatusPath; use hg::dirstate::status::StatusPath;
use hg::{ use hg::{
matchers::{AlwaysMatcher, FileMatcher, IncludeMatcher}, matchers::{AlwaysMatcher, FileMatcher, IncludeMatcher},
parse_pattern_syntax, parse_pattern_syntax,
fn handle_fallback(py: Python, err: StatusError) -> PyErr { fn handle_fallback(py: Python, err: StatusError) -> PyErr {
match err { match err {
StatusError::Pattern(e) => { StatusError::Pattern(e) => {
let as_string = e.to_string(); let as_string = e.to_string();
log::trace!("Rust status fallback: `{}`", &as_string); log::trace!("Rust status fallback: `{}`", &as_string);
PyErr::new::<FallbackError, _>(py, &as_string) PyErr::new::<FallbackError, _>(py, &as_string)
} }
StatusError::IO(e) => PyErr::new::<OSError, _>(py, e.to_string()),
e => PyErr::new::<ValueError, _>(py, e.to_string()), e => PyErr::new::<ValueError, _>(py, e.to_string()),
} }
} }
pub fn status_wrapper( pub fn status_wrapper(
py: Python, py: Python,
dmap: DirstateMap, dmap: DirstateMap,
matcher: PyObject, matcher: PyObject,