From a0b8f38ab54ac451646aa00cd5e91b6c76f22a84 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:57:19 +0200 Subject: Merging upstream version 1.72.1+dfsg1. Signed-off-by: Daniel Baumann --- vendor/gix-ref/src/fullname.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'vendor/gix-ref/src/fullname.rs') 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. -- cgit v1.2.3