From ef24de24a82fe681581cc130f342363c47c0969a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 7 Jun 2024 07:48:48 +0200 Subject: Merging upstream version 1.75.0+dfsg1. Signed-off-by: Daniel Baumann --- vendor/clap_builder/src/builder/debug_asserts.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'vendor/clap_builder/src/builder/debug_asserts.rs') diff --git a/vendor/clap_builder/src/builder/debug_asserts.rs b/vendor/clap_builder/src/builder/debug_asserts.rs index afc181c54..2b633849f 100644 --- a/vendor/clap_builder/src/builder/debug_asserts.rs +++ b/vendor/clap_builder/src/builder/debug_asserts.rs @@ -405,6 +405,12 @@ impl PartialEq for Flag<'_> { impl PartialOrd for Flag<'_> { fn partial_cmp(&self, other: &Flag) -> Option { + Some(self.cmp(other)) + } +} + +impl Ord for Flag<'_> { + fn cmp(&self, other: &Self) -> Ordering { use Flag::*; match (self, other) { @@ -413,21 +419,15 @@ impl PartialOrd for Flag<'_> { | (Command(s1, _), Arg(s2, _)) | (Arg(s1, _), Command(s2, _)) => { if s1 == s2 { - Some(Ordering::Equal) + Ordering::Equal } else { - s1.partial_cmp(s2) + s1.cmp(s2) } } } } } -impl Ord for Flag<'_> { - fn cmp(&self, other: &Self) -> Ordering { - self.partial_cmp(other).unwrap() - } -} - fn detect_duplicate_flags(flags: &[Flag], short_or_long: &str) { use Flag::*; -- cgit v1.2.3