diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
commit | dc0db358abe19481e475e10c32149b53370f1a1c (patch) | |
tree | ab8ce99c4b255ce46f99ef402c27916055b899ee /vendor/gix-traverse/src | |
parent | Releasing progress-linux version 1.71.1+dfsg1-2~progress7.99u1. (diff) | |
download | rustc-dc0db358abe19481e475e10c32149b53370f1a1c.tar.xz rustc-dc0db358abe19481e475e10c32149b53370f1a1c.zip |
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-traverse/src')
-rw-r--r-- | vendor/gix-traverse/src/commit.rs | 6 | ||||
-rw-r--r-- | vendor/gix-traverse/src/tree/breadthfirst.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/vendor/gix-traverse/src/commit.rs b/vendor/gix-traverse/src/commit.rs index 6e7e0c9e7..95d48842a 100644 --- a/vendor/gix-traverse/src/commit.rs +++ b/vendor/gix-traverse/src/commit.rs @@ -110,7 +110,7 @@ pub mod ancestors { if !matches!(self.sorting, Sorting::Topological) { let mut cutoff_time_storage = self.sorting.cutoff_time().map(|cot| (cot, Vec::new())); let state = self.state.borrow_mut(); - for (commit_id, commit_time) in state.next.iter_mut() { + for (commit_id, commit_time) in &mut state.next { let commit_iter = (self.find)(commit_id, &mut state.buf).map_err(|err| Error::FindExisting { oid: *commit_id, source: err.into(), @@ -144,7 +144,7 @@ pub mod ancestors { { /// Create a new instance. /// - /// * `find` - a way to lookup new object data during traversal by their ObjectId, writing their data into buffer and returning + /// * `find` - a way to lookup new object data during traversal by their `ObjectId`, writing their data into buffer and returning /// an iterator over commit tokens if the object is present and is a commit. Caching should be implemented within this function /// as needed. /// * `state` - all state used for the traversal. If multiple traversals are performed, allocations can be minimized by reusing @@ -167,7 +167,7 @@ pub mod ancestors { { /// Create a new instance with commit filtering enabled. /// - /// * `find` - a way to lookup new object data during traversal by their ObjectId, writing their data into buffer and returning + /// * `find` - a way to lookup new object data during traversal by their `ObjectId`, writing their data into buffer and returning /// an iterator over commit tokens if the object is present and is a commit. Caching should be implemented within this function /// as needed. /// * `state` - all state used for the traversal. If multiple traversals are performed, allocations can be minimized by reusing diff --git a/vendor/gix-traverse/src/tree/breadthfirst.rs b/vendor/gix-traverse/src/tree/breadthfirst.rs index b0c7ffdf5..115b9a396 100644 --- a/vendor/gix-traverse/src/tree/breadthfirst.rs +++ b/vendor/gix-traverse/src/tree/breadthfirst.rs @@ -43,7 +43,7 @@ pub(crate) mod impl_ { /// * the tree to iterate in a nested fashion. /// * `state` - all state used for the iteration. If multiple iterations are performed, allocations can be minimized by reusing /// this state. - /// * `find` - a way to lookup new object data during traversal by their ObjectId, writing their data into buffer and returning + /// * `find` - a way to lookup new object data during traversal by their `ObjectId`, writing their data into buffer and returning /// an iterator over entries if the object is present and is a tree. Caching should be implemented within this function /// as needed. The return value is `Option<TreeIter>` which degenerates all error information. Not finding a commit should also /// be considered an errors as all objects in the tree DAG should be present in the database. Hence [`Error::NotFound`] should |