Skip to content

Commit f7b4c72

Browse files
committed
Auto merge of rust-lang#130492 - matthiaskrgr:rollup-9pxkd8i, r=matthiaskrgr
Rollup of 2 pull requests Successful merges: - rust-lang#130481 (Remove uneeded PartialOrd bound in cmp::Ord::clamp) - rust-lang#130482 (Remove redundant test typeid equality by subtyping) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 28e8f01 + 7e8eb7a commit f7b4c72

File tree

3 files changed

+0
-82
lines changed

3 files changed

+0
-82
lines changed

Diff for: library/core/src/cmp.rs

-1
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,6 @@ pub trait Ord: Eq + PartialOrd<Self> {
901901
fn clamp(self, min: Self, max: Self) -> Self
902902
where
903903
Self: Sized,
904-
Self: PartialOrd,
905904
{
906905
assert!(min <= max);
907906
if self < min {

Diff for: tests/ui/const-generics/generic_const_exprs/typeid-equality-by-subtyping.rs

-54
This file was deleted.

Diff for: tests/ui/const-generics/generic_const_exprs/typeid-equality-by-subtyping.stderr

-27
This file was deleted.

0 commit comments

Comments
 (0)