Rollup merge of rust-lang#130481 - krtab:clamp_partial_ord, r=cuviper

matthiaskrgr · web-flow · commit e65d8e8dfef2 · 2024-09-18T00:12:19.000+02:00
Remove uneeded PartialOrd bound in cmp::Ord::clamp There is a `Self: PartialOrd` bound in `Ord::clamp`, but it is already required by the trait itself. Likely a left-over from the const trait deletion in 76dbe29. Reported-by: `@noeensarguet`
diff --git a/core/src/cmp.rs b/core/src/cmp.rs
@@ -901,7 +901,6 @@ pub trait Ord: Eq + PartialOrd<Self> {
     fn clamp(self, min: Self, max: Self) -> Self
     where
         Self: Sized,
-        Self: PartialOrd,
     {
         assert!(min <= max);
         if self < min {

Original file line number	Diff line number	Diff line change
`@@ -901,7 +901,6 @@ pub trait Ord: Eq + PartialOrd<Self> {`
`901`	`901`	`fn clamp(self, min: Self, max: Self) -> Self`
`902`	`902`	`where`
`903`	`903`	`Self: Sized,`
`904`		`- Self: PartialOrd,`
`905`	`904`	`{`
`906`	`905`	`assert!(min <= max);`
`907`	`906`	`if self < min {`