diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:42 +0000 |
| commit | 837b550238aa671a591ccf282dddeab29cadb206 (patch) | |
| tree | 914b6b8862bace72bd3245ca184d374b08d8a672 /vendor/gix-diff | |
| parent | Adding debian version 1.70.0+dfsg2-1. (diff) | |
| download | rustc-837b550238aa671a591ccf282dddeab29cadb206.tar.xz rustc-837b550238aa671a591ccf282dddeab29cadb206.zip | |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-diff')
| -rw-r--r-- | vendor/gix-diff/.cargo-checksum.json | 2 | ||||
| -rw-r--r-- | vendor/gix-diff/Cargo.toml | 14 | ||||
| -rw-r--r-- | vendor/gix-diff/src/tree/visit.rs | 9 |
3 files changed, 10 insertions, 15 deletions
diff --git a/vendor/gix-diff/.cargo-checksum.json b/vendor/gix-diff/.cargo-checksum.json index d54dce881..bbdc7de5a 100644 --- a/vendor/gix-diff/.cargo-checksum.json +++ b/vendor/gix-diff/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"77260a68e5126814975298ede602b42e36968371ad1a667a1a3685c3c51760bd","src/blob.rs":"2ee987cc738042ed3d5a001943685abe8692a49a3a1c253a0f6fd96702c35240","src/lib.rs":"7746135a7cf1fd329e515231e4867995644ae33c45e4affd85cd4f2354284287","src/tree/changes.rs":"dc78ececac440e8e1794842ae038eb7ad9ba606b5cda6ebbd93eb1f2c983b323","src/tree/mod.rs":"e82dc5ba05a10f85cdb01d7a6d14911e83f3e01fc6e4ca7b9d6835f3ac42b79a","src/tree/recorder.rs":"75915b88b4edba8b8e51d6777a66d51a9e9c9bb04e885785d5f7bc0b42dfbb4d","src/tree/visit.rs":"29934a3f386a45f482e7cb1288d29871dd833785bea4f535f98a5269115376c5"},"package":"585b0834d4b6791a848637c4e109545fda9b0f29b591ba55edb33ceda6e7856b"}
\ No newline at end of file +{"files":{"Cargo.toml":"a6e8dae9e9f240ed09710ae864137dc5616ba8d13a7ef5f73aaa445099106a61","src/blob.rs":"2ee987cc738042ed3d5a001943685abe8692a49a3a1c253a0f6fd96702c35240","src/lib.rs":"7746135a7cf1fd329e515231e4867995644ae33c45e4affd85cd4f2354284287","src/tree/changes.rs":"dc78ececac440e8e1794842ae038eb7ad9ba606b5cda6ebbd93eb1f2c983b323","src/tree/mod.rs":"e82dc5ba05a10f85cdb01d7a6d14911e83f3e01fc6e4ca7b9d6835f3ac42b79a","src/tree/recorder.rs":"75915b88b4edba8b8e51d6777a66d51a9e9c9bb04e885785d5f7bc0b42dfbb4d","src/tree/visit.rs":"823ca26b1658ed101da8ae400d481b3008670aeb3ff72680a29f8b2bc5029ba1"},"package":"644a0f2768bc42d7a69289ada80c9e15c589caefc6a315d2307202df83ed1186"}
\ No newline at end of file diff --git a/vendor/gix-diff/Cargo.toml b/vendor/gix-diff/Cargo.toml index 5fe90eb0d..1bc59b807 100644 --- a/vendor/gix-diff/Cargo.toml +++ b/vendor/gix-diff/Cargo.toml @@ -13,7 +13,7 @@ edition = "2021" rust-version = "1.64" name = "gix-diff" -version = "0.28.0" +version = "0.29.0" authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"] include = ["src/**/*"] autotests = false @@ -31,10 +31,10 @@ optional = true default-features = false [dependencies.gix-hash] -version = "^0.10.2" +version = "^0.11.1" [dependencies.gix-object] -version = "^0.28.0" +version = "^0.29.1" [dependencies.imara-diff] version = "0.1.3" @@ -49,9 +49,9 @@ default-features = false version = "1.0.32" [features] -serde1 = [ - "serde", - "gix-hash/serde1", - "gix-object/serde1", +serde = [ + "dep:serde", + "gix-hash/serde", + "gix-object/serde", ] wasm = ["dep:getrandom"] diff --git a/vendor/gix-diff/src/tree/visit.rs b/vendor/gix-diff/src/tree/visit.rs index e94c432ae..82e38931d 100644 --- a/vendor/gix-diff/src/tree/visit.rs +++ b/vendor/gix-diff/src/tree/visit.rs @@ -59,20 +59,15 @@ impl Change { } /// What to do after a [Change] was [recorded][Visit::visit()]. -#[derive(Clone, Copy, PartialOrd, PartialEq, Ord, Eq, Hash)] +#[derive(Default, Clone, Copy, PartialOrd, PartialEq, Ord, Eq, Hash)] pub enum Action { /// Continue the traversal of changes. + #[default] Continue, /// Stop the traversal of changes, making this the last call to [visit(…)][Visit::visit()]. Cancel, } -impl Default for Action { - fn default() -> Self { - Action::Continue - } -} - impl Action { /// Returns true if this action means to stop the traversal. pub fn cancelled(&self) -> bool { |