Skip to content

Commit 0c81bf8

Browse files
committed
fix PartialEq const feature name and const_cmp tracking issue
1 parent 855e0fe commit 0c81bf8

17 files changed

+29
-28
lines changed

library/core/src/cmp.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ use crate::ops::ControlFlow;
248248
)]
249249
#[rustc_diagnostic_item = "PartialEq"]
250250
#[const_trait]
251-
#[rustc_const_unstable(feature = "const_trait_impl", issue = "67792")]
251+
#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]
252252
pub trait PartialEq<Rhs: PointeeSized = Self>: PointeeSized {
253253
/// Tests for `self` and `other` values to be equal, and is used by `==`.
254254
#[must_use]
@@ -1809,7 +1809,7 @@ mod impls {
18091809
macro_rules! partial_eq_impl {
18101810
($($t:ty)*) => ($(
18111811
#[stable(feature = "rust1", since = "1.0.0")]
1812-
#[rustc_const_unstable(feature = "const_cmp", issue = "92391")]
1812+
#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]
18131813
impl const PartialEq for $t {
18141814
#[inline]
18151815
fn eq(&self, other: &Self) -> bool { *self == *other }
@@ -2017,7 +2017,7 @@ mod impls {
20172017
// & pointers
20182018

20192019
#[stable(feature = "rust1", since = "1.0.0")]
2020-
#[rustc_const_unstable(feature = "const_cmp", issue = "92391")]
2020+
#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]
20212021
impl<A: PointeeSized, B: PointeeSized> const PartialEq<&B> for &A
20222022
where
20232023
A: ~const PartialEq<B>,
@@ -2089,7 +2089,7 @@ mod impls {
20892089
// &mut pointers
20902090

20912091
#[stable(feature = "rust1", since = "1.0.0")]
2092-
#[rustc_const_unstable(feature = "const_cmp", issue = "92391")]
2092+
#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]
20932093
impl<A: PointeeSized, B: PointeeSized> const PartialEq<&mut B> for &mut A
20942094
where
20952095
A: ~const PartialEq<B>,
@@ -2159,7 +2159,7 @@ mod impls {
21592159
impl<A: PointeeSized> Eq for &mut A where A: Eq {}
21602160

21612161
#[stable(feature = "rust1", since = "1.0.0")]
2162-
#[rustc_const_unstable(feature = "const_cmp", issue = "92391")]
2162+
#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]
21632163
impl<A: PointeeSized, B: PointeeSized> const PartialEq<&mut B> for &A
21642164
where
21652165
A: ~const PartialEq<B>,
@@ -2175,7 +2175,7 @@ mod impls {
21752175
}
21762176

21772177
#[stable(feature = "rust1", since = "1.0.0")]
2178-
#[rustc_const_unstable(feature = "const_cmp", issue = "92391")]
2178+
#[rustc_const_unstable(feature = "const_cmp", issue = "143800")]
21792179
impl<A: PointeeSized, B: PointeeSized> const PartialEq<&B> for &mut A
21802180
where
21812181
A: ~const PartialEq<B>,

tests/ui/const-generics/issues/issue-90318.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![feature(const_type_id)]
22
#![feature(generic_const_exprs)]
3-
#![feature(const_trait_impl)]
3+
#![feature(const_trait_impl, const_cmp)]
44
#![feature(core_intrinsics)]
55
#![allow(incomplete_features)]
66

tests/ui/consts/const_cmp_type_id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//@ compile-flags: -Znext-solver
2-
#![feature(const_type_id, const_trait_impl)]
2+
#![feature(const_type_id, const_trait_impl, const_cmp)]
33

44
use std::any::TypeId;
55

tests/ui/consts/const_transmute_type_id.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(const_type_id, const_trait_impl)]
1+
#![feature(const_type_id, const_trait_impl, const_cmp)]
22

33
use std::any::TypeId;
44

tests/ui/consts/const_transmute_type_id2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ normalize-stderr: "0x(ff)+" -> "<u128::MAX>"
22

3-
#![feature(const_type_id, const_trait_impl)]
3+
#![feature(const_type_id, const_trait_impl, const_cmp)]
44

55
use std::any::TypeId;
66

tests/ui/consts/const_transmute_type_id3.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(const_type_id, const_trait_impl)]
1+
#![feature(const_type_id, const_trait_impl, const_cmp)]
22

33
use std::any::TypeId;
44

tests/ui/consts/const_transmute_type_id4.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(const_type_id, const_trait_impl)]
1+
#![feature(const_type_id, const_trait_impl, const_cmp)]
22

33
use std::any::TypeId;
44

tests/ui/consts/issue-73976-monomorphic.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#![feature(const_type_id)]
99
#![feature(const_type_name)]
1010
#![feature(const_trait_impl)]
11+
#![feature(const_cmp)]
1112

1213
use std::any::{self, TypeId};
1314

tests/ui/consts/issue-90870.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
#![allow(dead_code)]
44

55
const fn f(a: &u8, b: &u8) -> bool {
6-
//~^ HELP: add `#![feature(const_trait_impl)]` to the crate attributes to enable
7-
//~| HELP: add `#![feature(const_trait_impl)]` to the crate attributes to enable
8-
//~| HELP: add `#![feature(const_trait_impl)]` to the crate attributes to enable
6+
//~^ HELP: add `#![feature(const_cmp)]` to the crate attributes to enable
7+
//~| HELP: add `#![feature(const_cmp)]` to the crate attributes to enable
8+
//~| HELP: add `#![feature(const_cmp)]` to the crate attributes to enable
99
a == b
1010
//~^ ERROR: cannot call conditionally-const operator in constant functions
1111
//~| ERROR: `PartialEq` is not yet stable as a const trait

tests/ui/consts/issue-90870.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ error: `PartialEq` is not yet stable as a const trait
1919
LL | a == b
2020
| ^^^^^^
2121
|
22-
help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
22+
help: add `#![feature(const_cmp)]` to the crate attributes to enable
2323
|
24-
LL + #![feature(const_trait_impl)]
24+
LL + #![feature(const_cmp)]
2525
|
2626

2727
error[E0658]: cannot call conditionally-const operator in constant functions
@@ -45,9 +45,9 @@ error: `PartialEq` is not yet stable as a const trait
4545
LL | a == b
4646
| ^^^^^^
4747
|
48-
help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
48+
help: add `#![feature(const_cmp)]` to the crate attributes to enable
4949
|
50-
LL + #![feature(const_trait_impl)]
50+
LL + #![feature(const_cmp)]
5151
|
5252

5353
error[E0658]: cannot call conditionally-const operator in constant functions
@@ -71,9 +71,9 @@ error: `PartialEq` is not yet stable as a const trait
7171
LL | if l == r {
7272
| ^^^^^^
7373
|
74-
help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
74+
help: add `#![feature(const_cmp)]` to the crate attributes to enable
7575
|
76-
LL + #![feature(const_trait_impl)]
76+
LL + #![feature(const_cmp)]
7777
|
7878

7979
error: aborting due to 6 previous errors

0 commit comments

Comments
 (0)