Mercurial > public > mercurial-scm > hg-stable
diff rust/hg-cpython/src/dirstate.rs @ 46508:776b97179c06
rust: Remove DirstateParseError and ListDirstateTrackedFilesError
Use HgError instead.
Differential Revision: https://phab.mercurial-scm.org/D9894
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Wed, 27 Jan 2021 14:00:21 +0100 |
parents | 2a68a5ec8dd0 |
children | d8ac62374943 |
line wrap: on
line diff
--- a/rust/hg-cpython/src/dirstate.rs Wed Jan 27 13:41:28 2021 +0100 +++ b/rust/hg-cpython/src/dirstate.rs Wed Jan 27 14:00:21 2021 +0100 @@ -24,10 +24,7 @@ exc, PyBytes, PyDict, PyErr, PyList, PyModule, PyObject, PyResult, PySequence, Python, }; -use hg::{ - utils::hg_path::HgPathBuf, DirstateEntry, DirstateParseError, EntryState, - StateMap, -}; +use hg::{utils::hg_path::HgPathBuf, DirstateEntry, EntryState, StateMap}; use libc::{c_char, c_int}; use std::convert::TryFrom; @@ -79,11 +76,10 @@ .map(|(filename, stats)| { let stats = stats.extract::<PySequence>(py)?; let state = stats.get_item(py, 0)?.extract::<PyBytes>(py)?; - let state = EntryState::try_from(state.data(py)[0]).map_err( - |e: DirstateParseError| { + let state = + EntryState::try_from(state.data(py)[0]).map_err(|e| { PyErr::new::<exc::ValueError, _>(py, e.to_string()) - }, - )?; + })?; let mode = stats.get_item(py, 1)?.extract(py)?; let size = stats.get_item(py, 2)?.extract(py)?; let mtime = stats.get_item(py, 3)?.extract(py)?;