Skip to content

Commit 44200a9

Browse files
authored
Rollup merge of #95175 - lcnr:adt_const_params-tracking-issue, r=Dylan-DPC
move `adt_const_params` to its own tracking issue the new tracking issue is #95174 r? ``@rust-lang/project-const-generics``
2 parents aa9077e + e8890aa commit 44200a9

File tree

4 files changed

+4
-42
lines changed

4 files changed

+4
-42
lines changed

compiler/rustc_feature/src/active.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ declare_features! (
287287
/// Allows `extern "x86-interrupt" fn()`.
288288
(active, abi_x86_interrupt, "1.17.0", Some(40180), None),
289289
/// Allows additional const parameter types, such as `&'static str` or user defined types
290-
(incomplete, adt_const_params, "1.56.0", Some(44580), None),
290+
(incomplete, adt_const_params, "1.56.0", Some(95174), None),
291291
/// Allows defining an `#[alloc_error_handler]`.
292292
(active, alloc_error_handler, "1.29.0", Some(51540), None),
293293
/// Allows explicit discriminants on non-unit enum variants.

src/test/ui/consts/refs_check_const_eq-issue-88384.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | #![feature(adt_const_params)]
55
| ^^^^^^^^^^^^^^^^
66
|
77
= note: `#[warn(incomplete_features)]` on by default
8-
= note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
8+
= note: see issue #95174 <https://github.com/rust-lang/rust/issues/95174> for more information
99

1010
warning: 1 warning emitted
1111

src/test/ui/error-codes/E0771.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | #![feature(adt_const_params)]
55
| ^^^^^^^^^^^^^^^^
66
|
77
= note: `#[warn(incomplete_features)]` on by default
8-
= note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
8+
= note: see issue #95174 <https://github.com/rust-lang/rust/issues/95174> for more information
99

1010
error[E0771]: use of non-static lifetime `'a` in const generic
1111
--> $DIR/E0771.rs:4:41

src/test/ui/issues/issue-28561.rs

+1-39
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// check-pass
2-
#[derive(Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
2+
#[derive(Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd, Clone, Copy)]
33
struct Array<T> {
44
f00: [T; 00],
55
f01: [T; 01],
@@ -36,44 +36,6 @@ struct Array<T> {
3636
f32: [T; 32],
3737
}
3838

39-
// FIXME(#44580): merge with `Array` once `[T; N]: Clone` where `T: Clone`
40-
#[derive(Clone, Copy)]
41-
struct CopyArray<T: Copy> {
42-
f00: [T; 00],
43-
f01: [T; 01],
44-
f02: [T; 02],
45-
f03: [T; 03],
46-
f04: [T; 04],
47-
f05: [T; 05],
48-
f06: [T; 06],
49-
f07: [T; 07],
50-
f08: [T; 08],
51-
f09: [T; 09],
52-
f10: [T; 10],
53-
f11: [T; 11],
54-
f12: [T; 12],
55-
f13: [T; 13],
56-
f14: [T; 14],
57-
f15: [T; 15],
58-
f16: [T; 16],
59-
f17: [T; 17],
60-
f18: [T; 18],
61-
f19: [T; 19],
62-
f20: [T; 20],
63-
f21: [T; 21],
64-
f22: [T; 22],
65-
f23: [T; 23],
66-
f24: [T; 24],
67-
f25: [T; 25],
68-
f26: [T; 26],
69-
f27: [T; 27],
70-
f28: [T; 28],
71-
f29: [T; 29],
72-
f30: [T; 30],
73-
f31: [T; 31],
74-
f32: [T; 32],
75-
}
76-
7739
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
7840
struct Fn<A, B, C, D, E, F, G, H, I, J, K, L> {
7941
f00: fn(),

0 commit comments

Comments
 (0)