##// END OF EJS Templates
rust-status: rename `StatusResult` to `DirstateStatus`...
Raphaël Gomès -
r45012:f13d1954 default
parent child Browse files
Show More
@@ -255,7 +255,7 b' fn stat_dmap_entries('
255 })
255 })
256 }
256 }
257
257
258 pub struct StatusResult<'a> {
258 pub struct DirstateStatus<'a> {
259 pub modified: Vec<&'a HgPath>,
259 pub modified: Vec<&'a HgPath>,
260 pub added: Vec<&'a HgPath>,
260 pub added: Vec<&'a HgPath>,
261 pub removed: Vec<&'a HgPath>,
261 pub removed: Vec<&'a HgPath>,
@@ -267,7 +267,7 b" pub struct StatusResult<'a> {"
267
267
268 fn build_response<'a>(
268 fn build_response<'a>(
269 results: impl IntoIterator<Item = IoResult<(&'a HgPath, Dispatch)>>,
269 results: impl IntoIterator<Item = IoResult<(&'a HgPath, Dispatch)>>,
270 ) -> IoResult<(Vec<&'a HgPath>, StatusResult<'a>)> {
270 ) -> IoResult<(Vec<&'a HgPath>, DirstateStatus<'a>)> {
271 let mut lookup = vec![];
271 let mut lookup = vec![];
272 let mut modified = vec![];
272 let mut modified = vec![];
273 let mut added = vec![];
273 let mut added = vec![];
@@ -290,7 +290,7 b" fn build_response<'a>("
290
290
291 Ok((
291 Ok((
292 lookup,
292 lookup,
293 StatusResult {
293 DirstateStatus {
294 modified,
294 modified,
295 added,
295 added,
296 removed,
296 removed,
@@ -305,7 +305,7 b" pub fn status<'a: 'c, 'b: 'c, 'c>("
305 matcher: &'b impl Matcher,
305 matcher: &'b impl Matcher,
306 root_dir: impl AsRef<Path> + Sync + Send + Copy,
306 root_dir: impl AsRef<Path> + Sync + Send + Copy,
307 options: StatusOptions,
307 options: StatusOptions,
308 ) -> IoResult<(Vec<&'c HgPath>, StatusResult<'c>)> {
308 ) -> IoResult<(Vec<&'c HgPath>, DirstateStatus<'c>)> {
309 let files = matcher.file_set();
309 let files = matcher.file_set();
310 let mut results = vec![];
310 let mut results = vec![];
311 if let Some(files) = files {
311 if let Some(files) = files {
@@ -13,7 +13,7 b' pub use dirstate::{'
13 dirs_multiset::{DirsMultiset, DirsMultisetIter},
13 dirs_multiset::{DirsMultiset, DirsMultisetIter},
14 dirstate_map::DirstateMap,
14 dirstate_map::DirstateMap,
15 parsers::{pack_dirstate, parse_dirstate, PARENT_SIZE},
15 parsers::{pack_dirstate, parse_dirstate, PARENT_SIZE},
16 status::{status, StatusOptions, StatusResult},
16 status::{status, DirstateStatus, StatusOptions},
17 CopyMap, CopyMapIter, DirstateEntry, DirstateParents, EntryState,
17 CopyMap, CopyMapIter, DirstateEntry, DirstateParents, EntryState,
18 StateMap, StateMapIter,
18 StateMap, StateMapIter,
19 };
19 };
@@ -20,7 +20,7 b' use hg::{'
20 matchers::{AlwaysMatcher, FileMatcher},
20 matchers::{AlwaysMatcher, FileMatcher},
21 status,
21 status,
22 utils::{files::get_path_from_bytes, hg_path::HgPath},
22 utils::{files::get_path_from_bytes, hg_path::HgPath},
23 StatusResult,
23 DirstateStatus,
24 };
24 };
25 use std::borrow::Borrow;
25 use std::borrow::Borrow;
26
26
@@ -114,7 +114,7 b' pub fn status_wrapper('
114
114
115 fn build_response(
115 fn build_response(
116 lookup: Vec<&HgPath>,
116 lookup: Vec<&HgPath>,
117 status_res: StatusResult,
117 status_res: DirstateStatus,
118 py: Python,
118 py: Python,
119 ) -> PyResult<(PyList, PyList, PyList, PyList, PyList, PyList, PyList)> {
119 ) -> PyResult<(PyList, PyList, PyList, PyList, PyList, PyList, PyList)> {
120 let modified = collect_pybytes_list(py, status_res.modified.as_ref());
120 let modified = collect_pybytes_list(py, status_res.modified.as_ref());
General Comments 0
You need to be logged in to leave comments. Login now