Mercurial > hg

changeset 44525:f13d19549efd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rust-status: rename `StatusResult` to `DirstateStatus` "Result" has a special meaning in the Rust world, this should be clearer. Differential Revision: https://phab.mercurial-scm.org/D8087
author Raphaël Gomès <rgomes@octobus.net>
date Thu, 06 Feb 2020 14:28:35 +0100
parents 483fce658e43
children 61709b844420
files rust/hg-core/src/dirstate/status.rs rust/hg-core/src/lib.rs rust/hg-cpython/src/dirstate/status.rs
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate/status.rs	Thu Feb 06 14:25:59 2020 +0100
+++ b/rust/hg-core/src/dirstate/status.rs	Thu Feb 06 14:28:35 2020 +0100
@@ -255,7 +255,7 @@
     })
 }
 
-pub struct StatusResult<'a> {
+pub struct DirstateStatus<'a> {
     pub modified: Vec<&'a HgPath>,
     pub added: Vec<&'a HgPath>,
     pub removed: Vec<&'a HgPath>,
@@ -267,7 +267,7 @@
 
 fn build_response<'a>(
     results: impl IntoIterator<Item = IoResult<(&'a HgPath, Dispatch)>>,
-) -> IoResult<(Vec<&'a HgPath>, StatusResult<'a>)> {
+) -> IoResult<(Vec<&'a HgPath>, DirstateStatus<'a>)> {
     let mut lookup = vec![];
     let mut modified = vec![];
     let mut added = vec![];
@@ -290,7 +290,7 @@
 
     Ok((
         lookup,
-        StatusResult {
+        DirstateStatus {
             modified,
             added,
             removed,
@@ -305,7 +305,7 @@
     matcher: &'b impl Matcher,
     root_dir: impl AsRef<Path> + Sync + Send + Copy,
     options: StatusOptions,
-) -> IoResult<(Vec<&'c HgPath>, StatusResult<'c>)> {
+) -> IoResult<(Vec<&'c HgPath>, DirstateStatus<'c>)> {
     let files = matcher.file_set();
     let mut results = vec![];
     if let Some(files) = files {
--- a/rust/hg-core/src/lib.rs	Thu Feb 06 14:25:59 2020 +0100
+++ b/rust/hg-core/src/lib.rs	Thu Feb 06 14:28:35 2020 +0100
@@ -13,7 +13,7 @@
     dirs_multiset::{DirsMultiset, DirsMultisetIter},
     dirstate_map::DirstateMap,
     parsers::{pack_dirstate, parse_dirstate, PARENT_SIZE},
-    status::{status, StatusOptions, StatusResult},
+    status::{status, DirstateStatus, StatusOptions},
     CopyMap, CopyMapIter, DirstateEntry, DirstateParents, EntryState,
     StateMap, StateMapIter,
 };
--- a/rust/hg-cpython/src/dirstate/status.rs	Thu Feb 06 14:25:59 2020 +0100
+++ b/rust/hg-cpython/src/dirstate/status.rs	Thu Feb 06 14:28:35 2020 +0100
@@ -20,7 +20,7 @@
     matchers::{AlwaysMatcher, FileMatcher},
     status,
     utils::{files::get_path_from_bytes, hg_path::HgPath},
-    StatusResult,
+    DirstateStatus,
 };
 use std::borrow::Borrow;
 
@@ -114,7 +114,7 @@
 
 fn build_response(
     lookup: Vec<&HgPath>,
-    status_res: StatusResult,
+    status_res: DirstateStatus,
     py: Python,
 ) -> PyResult<(PyList, PyList, PyList, PyList, PyList, PyList, PyList)> {
     let modified = collect_pybytes_list(py, status_res.modified.as_ref());