summaryrefslogtreecommitdiffstats
path: root/vendor/gix-traverse
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:50 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:50 +0000
commit9835e2ae736235810b4ea1c162ca5e65c547e770 (patch)
tree3fcebf40ed70e581d776a8a4c65923e8ec20e026 /vendor/gix-traverse
parentReleasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff)
downloadrustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz
rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-traverse')
-rw-r--r--vendor/gix-traverse/.cargo-checksum.json2
-rw-r--r--vendor/gix-traverse/Cargo.toml8
-rw-r--r--vendor/gix-traverse/src/commit.rs18
3 files changed, 9 insertions, 19 deletions
diff --git a/vendor/gix-traverse/.cargo-checksum.json b/vendor/gix-traverse/.cargo-checksum.json
index 9c643b372..221a8dd5d 100644
--- a/vendor/gix-traverse/.cargo-checksum.json
+++ b/vendor/gix-traverse/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"d0a9e70396726bbe2cc88935eebb6cd25585d1bddfafb5778ad86b5a0657255e","src/commit.rs":"25ac85fe6c317bdf195dff6fbbe703853117bd58bd267f6d501622d217d2175d","src/lib.rs":"e393d36a432571c44efd478739fb5ff6779b188618aac2058e1d45af809ecc54","src/tree/breadthfirst.rs":"cb6c05f8ecc8c09e0297e00a439e26722911427d73309969c04e90d1d13f8b55","src/tree/mod.rs":"7d8c982aabf8b0cf4952fe542cd7623e17a171c2c689e141b5a711549c5e708f","src/tree/recorder.rs":"da18f92a15b76d886e57e10e586951287110cb8062ecff1f4c11195838eb2625"},"package":"dd9a4a07bb22168dc79c60e1a6a41919d198187ca83d8a5940ad8d7122a45df3"} \ No newline at end of file
+{"files":{"Cargo.toml":"9a7aa3b82f26726e4d4d454997748926ea92f6a74799007d8ec8c71cb27c3197","src/commit.rs":"f7f5d190c7beccee1b4f7646af3ebbf30a959637f2645012eba51b84e5fa222e","src/lib.rs":"e393d36a432571c44efd478739fb5ff6779b188618aac2058e1d45af809ecc54","src/tree/breadthfirst.rs":"cb6c05f8ecc8c09e0297e00a439e26722911427d73309969c04e90d1d13f8b55","src/tree/mod.rs":"7d8c982aabf8b0cf4952fe542cd7623e17a171c2c689e141b5a711549c5e708f","src/tree/recorder.rs":"da18f92a15b76d886e57e10e586951287110cb8062ecff1f4c11195838eb2625"},"package":"a5be1e807f288c33bb005075111886cceb43ed8a167b3182a0f62c186e2a0dd1"} \ No newline at end of file
diff --git a/vendor/gix-traverse/Cargo.toml b/vendor/gix-traverse/Cargo.toml
index 0f8006a1d..277676e69 100644
--- a/vendor/gix-traverse/Cargo.toml
+++ b/vendor/gix-traverse/Cargo.toml
@@ -13,7 +13,7 @@
edition = "2021"
rust-version = "1.64"
name = "gix-traverse"
-version = "0.24.0"
+version = "0.25.0"
authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
include = ["src/**/*"]
autotests = false
@@ -25,13 +25,13 @@ repository = "https://github.com/Byron/gitoxide"
doctest = false
[dependencies.gix-hash]
-version = "^0.10.2"
+version = "^0.11.1"
[dependencies.gix-hashtable]
-version = "^0.1.2"
+version = "^0.2.0"
[dependencies.gix-object]
-version = "^0.28.0"
+version = "^0.29.1"
[dependencies.thiserror]
version = "1.0.32"
diff --git a/vendor/gix-traverse/src/commit.rs b/vendor/gix-traverse/src/commit.rs
index 890fde2a9..6e7e0c9e7 100644
--- a/vendor/gix-traverse/src/commit.rs
+++ b/vendor/gix-traverse/src/commit.rs
@@ -8,24 +8,20 @@ pub struct Ancestors<Find, Predicate, StateMut> {
}
/// Specify how to handle commit parents during traversal.
-#[derive(Copy, Clone)]
+#[derive(Default, Copy, Clone)]
pub enum Parents {
/// Traverse all parents, useful for traversing the entire ancestry.
+ #[default]
All,
/// Only traverse along the first parent, which commonly ignores all branches.
First,
}
-impl Default for Parents {
- fn default() -> Self {
- Parents::All
- }
-}
-
/// Specify how to sort commits during traversal.
-#[derive(Copy, Clone)]
+#[derive(Default, Debug, Copy, Clone)]
pub enum Sorting {
/// Commits are sorted as they are mentioned in the commit graph.
+ #[default]
Topological,
/// Commits are sorted by their commit time in descending order, that is newest first.
///
@@ -46,12 +42,6 @@ pub enum Sorting {
},
}
-impl Default for Sorting {
- fn default() -> Self {
- Sorting::Topological
- }
-}
-
///
pub mod ancestors {
use std::{