Auto merge of #130492 - matthiaskrgr:rollup-9pxkd8i, r=matthiaskrgr

Rollup of 2 pull requests Successful merges: - #130481 (Remove uneeded PartialOrd bound in cmp::Ord::clamp) - #130482 (Remove redundant test typeid equality by subtyping) r? `@ghost` `@rustbot` modify labels: rollup
rust-lang · Sep 17, 2024 · f7b4c72 · f7b4c72
2 parents 28e8f01 + 7e8eb7a
commit f7b4c72
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 82 deletions.
diff --git a/library/core/src/cmp.rs b/library/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 {

diff --git a/tests/ui/const-generics/generic_const_exprs/typeid-equality-by-subtyping.rs b/tests/ui/const-generics/generic_const_exprs/typeid-equality-by-subtyping.rs
diff --git a/tests/ui/const-generics/generic_const_exprs/typeid-equality-by-subtyping.stderr b/tests/ui/const-generics/generic_const_exprs/typeid-equality-by-subtyping.stderr