diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:19 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:19 +0000 |
commit | a0b8f38ab54ac451646aa00cd5e91b6c76f22a84 (patch) | |
tree | fc451898ccaf445814e26b46664d78702178101d /vendor/gix-ref/src/transaction | |
parent | Adding debian version 1.71.1+dfsg1-2. (diff) | |
download | rustc-a0b8f38ab54ac451646aa00cd5e91b6c76f22a84.tar.xz rustc-a0b8f38ab54ac451646aa00cd5e91b6c76f22a84.zip |
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix-ref/src/transaction')
-rw-r--r-- | vendor/gix-ref/src/transaction/mod.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/vendor/gix-ref/src/transaction/mod.rs b/vendor/gix-ref/src/transaction/mod.rs index d13ff2e70..77ab7349d 100644 --- a/vendor/gix-ref/src/transaction/mod.rs +++ b/vendor/gix-ref/src/transaction/mod.rs @@ -96,19 +96,11 @@ impl Change { match self { // TODO: use or-patterns once MRV is larger than 1.52 (and this is supported) Change::Update { - expected: PreviousValue::MustExistAndMatch(previous), - .. - } - | Change::Update { - expected: PreviousValue::ExistingMustMatch(previous), - .. - } - | Change::Delete { - expected: PreviousValue::MustExistAndMatch(previous), + expected: PreviousValue::MustExistAndMatch(previous) | PreviousValue::ExistingMustMatch(previous), .. } | Change::Delete { - expected: PreviousValue::ExistingMustMatch(previous), + expected: PreviousValue::MustExistAndMatch(previous) | PreviousValue::ExistingMustMatch(previous), .. } => previous, _ => return None, |