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-refspec/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-refspec/src')
-rw-r--r-- | vendor/gix-refspec/src/instruction.rs | 2 | ||||
-rw-r--r-- | vendor/gix-refspec/src/match_group/util.rs | 2 | ||||
-rw-r--r-- | vendor/gix-refspec/src/spec.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vendor/gix-refspec/src/instruction.rs b/vendor/gix-refspec/src/instruction.rs index 990d0debc..8cf4ef849 100644 --- a/vendor/gix-refspec/src/instruction.rs +++ b/vendor/gix-refspec/src/instruction.rs @@ -57,7 +57,7 @@ pub enum Fetch<'a> { }, /// Fetch from `src` and update the corresponding destination branches in `dst` accordingly. AndUpdate { - /// The ref name to fetch on the remote side, or a pattern with a single `*` to match against. + /// The ref name to fetch on the remote side, or a pattern with a single `*` to match against, or the full object hex-name. src: &'a BStr, /// The local destination to update with what was fetched, or a pattern whose single `*` will be replaced with the matching portion /// of the `*` from `src`. diff --git a/vendor/gix-refspec/src/match_group/util.rs b/vendor/gix-refspec/src/match_group/util.rs index 5339aef32..7606dbe8a 100644 --- a/vendor/gix-refspec/src/match_group/util.rs +++ b/vendor/gix-refspec/src/match_group/util.rs @@ -20,7 +20,7 @@ impl<'a> Matcher<'a> { match (self.lhs, self.rhs) { (Some(lhs), None) => (lhs.matches(item).is_match(), None), (Some(lhs), Some(rhs)) => lhs.matches(item).into_match_outcome(rhs, item), - (None, None) | (None, Some(_)) => { + (None, _) => { unreachable!("For all we know, the lefthand side is never empty. Push specs might change that.") } } diff --git a/vendor/gix-refspec/src/spec.rs b/vendor/gix-refspec/src/spec.rs index 9361ae682..43a5fce80 100644 --- a/vendor/gix-refspec/src/spec.rs +++ b/vendor/gix-refspec/src/spec.rs @@ -7,7 +7,7 @@ use crate::{ Instruction, RefSpec, RefSpecRef, }; -/// Conversion. Use the [RefSpecRef][RefSpec::to_ref()] type for more usage options. +/// Conversion. Use the [`RefSpecRef`][RefSpec::to_ref()] type for more usage options. impl RefSpec { /// Return ourselves as reference type. pub fn to_ref(&self) -> RefSpecRef<'_> { |