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-ref/src/fullname.rs | |
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-ref/src/fullname.rs')
-rw-r--r-- | vendor/gix-ref/src/fullname.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vendor/gix-ref/src/fullname.rs b/vendor/gix-ref/src/fullname.rs index 8870e6219..257bbe060 100644 --- a/vendor/gix-ref/src/fullname.rs +++ b/vendor/gix-ref/src/fullname.rs @@ -92,8 +92,7 @@ impl FullNameRef { /// If there is no such prefix, the original name is returned. pub fn shorten(&self) -> &BStr { self.category_and_short_name() - .map(|(_, short)| short) - .unwrap_or_else(|| self.0.as_bstr()) + .map_or_else(|| self.0.as_bstr(), |(_, short)| short) } /// Classify this name, or return `None` if it's unclassified. |