Skip to content

Commit ca891c1

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#133402
Rollup merge of rust-lang#133402 - compiler-errors:drop-and-destruct, r=lcnr Constify `Drop` and `Destruct` r? `@lcnr` or `@fee1-dead`
2 parents dd2837e + bd44b63 commit ca891c1

23 files changed

+113
-675
lines changed

‎library/core/src/marker.rs

+1
Original file line numberDiff line numberDiff line change
@@ -957,6 +957,7 @@ marker_impls! {
957957
#[lang = "destruct"]
958958
#[rustc_on_unimplemented(message = "can't drop `{Self}`", append_const_msg)]
959959
#[rustc_deny_explicit_impl(implement_via_object = false)]
960+
#[cfg_attr(not(bootstrap), const_trait)]
960961
pub trait Destruct {}
961962

962963
/// A marker for tuple types.

‎library/core/src/ops/drop.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
/// [nomicon]: ../../nomicon/phantom-data.html#an-exception-the-special-case-of-the-standard-library-and-its-unstable-may_dangle
204204
#[lang = "drop"]
205205
#[stable(feature = "rust1", since = "1.0.0")]
206-
// FIXME(const_trait_impl) #[const_trait]
206+
#[cfg_attr(not(bootstrap), const_trait)]
207207
pub trait Drop {
208208
/// Executes the destructor for this type.
209209
///

‎tests/ui/consts/const-block-const-bound.stderr

+6-22
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,9 @@
1-
error: `~const` can only be applied to `#[const_trait]` traits
2-
--> $DIR/const-block-const-bound.rs:8:15
1+
error[E0277]: the trait bound `UnconstDrop: const Destruct` is not satisfied
2+
--> $DIR/const-block-const-bound.rs:18:9
33
|
4-
LL | const fn f<T: ~const Destruct>(x: T) {}
5-
| ^^^^^^
4+
LL | f(UnconstDrop);
5+
| ^^^^^^^^^^^^^^
66

7-
error: `~const` can only be applied to `#[const_trait]` traits
8-
--> $DIR/const-block-const-bound.rs:8:15
9-
|
10-
LL | const fn f<T: ~const Destruct>(x: T) {}
11-
| ^^^^^^
12-
|
13-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
14-
15-
error[E0493]: destructor of `T` cannot be evaluated at compile-time
16-
--> $DIR/const-block-const-bound.rs:8:32
17-
|
18-
LL | const fn f<T: ~const Destruct>(x: T) {}
19-
| ^ - value is dropped here
20-
| |
21-
| the destructor for this type cannot be evaluated in constant functions
22-
23-
error: aborting due to 3 previous errors
7+
error: aborting due to 1 previous error
248

25-
For more information about this error, try `rustc --explain E0493`.
9+
For more information about this error, try `rustc --explain E0277`.

‎tests/ui/consts/fn_trait_refs.stderr

+24-102
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ error: `~const` can only be applied to `#[const_trait]` traits
1616
LL | T: ~const Fn<()> + ~const Destruct,
1717
| ^^^^^^
1818

19-
error: `~const` can only be applied to `#[const_trait]` traits
20-
--> $DIR/fn_trait_refs.rs:14:24
21-
|
22-
LL | T: ~const Fn<()> + ~const Destruct,
23-
| ^^^^^^
24-
2519
error: `~const` can only be applied to `#[const_trait]` traits
2620
--> $DIR/fn_trait_refs.rs:14:8
2721
|
@@ -38,26 +32,12 @@ LL | T: ~const Fn<()> + ~const Destruct,
3832
|
3933
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
4034

41-
error: `~const` can only be applied to `#[const_trait]` traits
42-
--> $DIR/fn_trait_refs.rs:14:24
43-
|
44-
LL | T: ~const Fn<()> + ~const Destruct,
45-
| ^^^^^^
46-
|
47-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
48-
4935
error: `~const` can only be applied to `#[const_trait]` traits
5036
--> $DIR/fn_trait_refs.rs:21:8
5137
|
5238
LL | T: ~const FnMut<()> + ~const Destruct,
5339
| ^^^^^^
5440

55-
error: `~const` can only be applied to `#[const_trait]` traits
56-
--> $DIR/fn_trait_refs.rs:21:27
57-
|
58-
LL | T: ~const FnMut<()> + ~const Destruct,
59-
| ^^^^^^
60-
6141
error: `~const` can only be applied to `#[const_trait]` traits
6242
--> $DIR/fn_trait_refs.rs:21:8
6343
|
@@ -74,14 +54,6 @@ LL | T: ~const FnMut<()> + ~const Destruct,
7454
|
7555
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
7656

77-
error: `~const` can only be applied to `#[const_trait]` traits
78-
--> $DIR/fn_trait_refs.rs:21:27
79-
|
80-
LL | T: ~const FnMut<()> + ~const Destruct,
81-
| ^^^^^^
82-
|
83-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
84-
8557
error: `~const` can only be applied to `#[const_trait]` traits
8658
--> $DIR/fn_trait_refs.rs:28:8
8759
|
@@ -110,12 +82,6 @@ error: `~const` can only be applied to `#[const_trait]` traits
11082
LL | T: ~const Fn<()> + ~const Destruct,
11183
| ^^^^^^
11284

113-
error: `~const` can only be applied to `#[const_trait]` traits
114-
--> $DIR/fn_trait_refs.rs:35:24
115-
|
116-
LL | T: ~const Fn<()> + ~const Destruct,
117-
| ^^^^^^
118-
11985
error: `~const` can only be applied to `#[const_trait]` traits
12086
--> $DIR/fn_trait_refs.rs:35:8
12187
|
@@ -132,26 +98,12 @@ LL | T: ~const Fn<()> + ~const Destruct,
13298
|
13399
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
134100

135-
error: `~const` can only be applied to `#[const_trait]` traits
136-
--> $DIR/fn_trait_refs.rs:35:24
137-
|
138-
LL | T: ~const Fn<()> + ~const Destruct,
139-
| ^^^^^^
140-
|
141-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
142-
143101
error: `~const` can only be applied to `#[const_trait]` traits
144102
--> $DIR/fn_trait_refs.rs:49:8
145103
|
146104
LL | T: ~const FnMut<()> + ~const Destruct,
147105
| ^^^^^^
148106

149-
error: `~const` can only be applied to `#[const_trait]` traits
150-
--> $DIR/fn_trait_refs.rs:49:27
151-
|
152-
LL | T: ~const FnMut<()> + ~const Destruct,
153-
| ^^^^^^
154-
155107
error: `~const` can only be applied to `#[const_trait]` traits
156108
--> $DIR/fn_trait_refs.rs:49:8
157109
|
@@ -168,29 +120,35 @@ LL | T: ~const FnMut<()> + ~const Destruct,
168120
|
169121
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
170122

171-
error: `~const` can only be applied to `#[const_trait]` traits
172-
--> $DIR/fn_trait_refs.rs:49:27
173-
|
174-
LL | T: ~const FnMut<()> + ~const Destruct,
175-
| ^^^^^^
123+
error[E0277]: the trait bound `fn() -> i32 {one}: const Destruct` is not satisfied
124+
--> $DIR/fn_trait_refs.rs:70:24
176125
|
177-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
126+
LL | let test_one = test_fn(one);
127+
| ^^^^^^^^^^^^
178128

179-
error[E0015]: cannot call non-const operator in constants
180-
--> $DIR/fn_trait_refs.rs:71:17
129+
error[E0277]: the trait bound `fn() -> i32 {two}: const Destruct` is not satisfied
130+
--> $DIR/fn_trait_refs.rs:73:24
181131
|
182-
LL | assert!(test_one == (1, 1, 1));
183-
| ^^^^^^^^^^^^^^^^^^^^^
132+
LL | let test_two = test_fn_mut(two);
133+
| ^^^^^^^^^^^^^^^^
134+
135+
error[E0277]: the trait bound `&T: ~const Destruct` is not satisfied
136+
--> $DIR/fn_trait_refs.rs:39:9
184137
|
185-
= note: calls in constants are limited to constant functions, tuple structs and tuple variants
138+
LL | tester_fn(&f),
139+
| ^^^^^^^^^^^^^
186140

187-
error[E0015]: cannot call non-const operator in constants
188-
--> $DIR/fn_trait_refs.rs:74:17
141+
error[E0277]: the trait bound `&T: ~const Destruct` is not satisfied
142+
--> $DIR/fn_trait_refs.rs:41:9
189143
|
190-
LL | assert!(test_two == (2, 2));
191-
| ^^^^^^^^^^^^^^^^^^
144+
LL | tester_fn_mut(&f),
145+
| ^^^^^^^^^^^^^^^^^
146+
147+
error[E0277]: the trait bound `&mut T: ~const Destruct` is not satisfied
148+
--> $DIR/fn_trait_refs.rs:53:9
192149
|
193-
= note: calls in constants are limited to constant functions, tuple structs and tuple variants
150+
LL | tester_fn_mut(&mut f),
151+
| ^^^^^^^^^^^^^^^^^^^^^
194152

195153
error[E0015]: cannot call non-const closure in constant functions
196154
--> $DIR/fn_trait_refs.rs:16:5
@@ -204,15 +162,6 @@ help: consider further restricting this bound
204162
LL | T: ~const Fn<()> + ~const Destruct + ~const Fn(),
205163
| +++++++++++++
206164

207-
error[E0493]: destructor of `T` cannot be evaluated at compile-time
208-
--> $DIR/fn_trait_refs.rs:12:23
209-
|
210-
LL | const fn tester_fn<T>(f: T) -> T::Output
211-
| ^ the destructor for this type cannot be evaluated in constant functions
212-
...
213-
LL | }
214-
| - value is dropped here
215-
216165
error[E0015]: cannot call non-const closure in constant functions
217166
--> $DIR/fn_trait_refs.rs:23:5
218167
|
@@ -225,15 +174,6 @@ help: consider further restricting this bound
225174
LL | T: ~const FnMut<()> + ~const Destruct + ~const FnMut(),
226175
| ++++++++++++++++
227176

228-
error[E0493]: destructor of `T` cannot be evaluated at compile-time
229-
--> $DIR/fn_trait_refs.rs:19:27
230-
|
231-
LL | const fn tester_fn_mut<T>(mut f: T) -> T::Output
232-
| ^^^^^ the destructor for this type cannot be evaluated in constant functions
233-
...
234-
LL | }
235-
| - value is dropped here
236-
237177
error[E0015]: cannot call non-const closure in constant functions
238178
--> $DIR/fn_trait_refs.rs:30:5
239179
|
@@ -246,25 +186,7 @@ help: consider further restricting this bound
246186
LL | T: ~const FnOnce<()> + ~const FnOnce(),
247187
| +++++++++++++++++
248188

249-
error[E0493]: destructor of `T` cannot be evaluated at compile-time
250-
--> $DIR/fn_trait_refs.rs:33:21
251-
|
252-
LL | const fn test_fn<T>(mut f: T) -> (T::Output, T::Output, T::Output)
253-
| ^^^^^ the destructor for this type cannot be evaluated in constant functions
254-
...
255-
LL | }
256-
| - value is dropped here
257-
258-
error[E0493]: destructor of `T` cannot be evaluated at compile-time
259-
--> $DIR/fn_trait_refs.rs:47:25
260-
|
261-
LL | const fn test_fn_mut<T>(mut f: T) -> (T::Output, T::Output)
262-
| ^^^^^ the destructor for this type cannot be evaluated in constant functions
263-
...
264-
LL | }
265-
| - value is dropped here
266-
267-
error: aborting due to 34 previous errors
189+
error: aborting due to 25 previous errors
268190

269-
Some errors have detailed explanations: E0015, E0493, E0635.
191+
Some errors have detailed explanations: E0015, E0277, E0635.
270192
For more information about an error, try `rustc --explain E0015`.

‎tests/ui/consts/promoted-const-drop.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
struct A();
44

55
impl const Drop for A {
6-
//~^ ERROR const `impl` for trait `Drop` which is not marked with `#[const_trait]`
76
fn drop(&mut self) {}
87
}
98

‎tests/ui/consts/promoted-const-drop.stderr

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
1-
error: const `impl` for trait `Drop` which is not marked with `#[const_trait]`
2-
--> $DIR/promoted-const-drop.rs:5:12
3-
|
4-
LL | impl const Drop for A {
5-
| ^^^^
6-
|
7-
= note: marking a trait with `#[const_trait]` ensures all default method bodies are `const`
8-
= note: adding a non-const method body in the future would be a breaking change
9-
101
error[E0716]: temporary value dropped while borrowed
11-
--> $DIR/promoted-const-drop.rs:13:26
2+
--> $DIR/promoted-const-drop.rs:12:26
123
|
134
LL | let _: &'static A = &A();
145
| ---------- ^^^ creates a temporary value which is freed while still in use
@@ -19,7 +10,7 @@ LL | }
1910
| - temporary value is freed at the end of this statement
2011

2112
error[E0716]: temporary value dropped while borrowed
22-
--> $DIR/promoted-const-drop.rs:14:28
13+
--> $DIR/promoted-const-drop.rs:13:28
2314
|
2415
LL | let _: &'static [A] = &[C];
2516
| ------------ ^^^ creates a temporary value which is freed while still in use
@@ -28,6 +19,6 @@ LL | let _: &'static [A] = &[C];
2819
LL | }
2920
| - temporary value is freed at the end of this statement
3021

31-
error: aborting due to 3 previous errors
22+
error: aborting due to 2 previous errors
3223

3324
For more information about this error, try `rustc --explain E0716`.

‎tests/ui/consts/promoted_const_call.stderr

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
error: const `impl` for trait `Drop` which is not marked with `#[const_trait]`
2-
--> $DIR/promoted_const_call.rs:6:12
3-
|
4-
LL | impl const Drop for Panic { fn drop(&mut self) { panic!(); } }
5-
| ^^^^
6-
|
7-
= note: marking a trait with `#[const_trait]` ensures all default method bodies are `const`
8-
= note: adding a non-const method body in the future would be a breaking change
9-
101
error[E0493]: destructor of `Panic` cannot be evaluated at compile-time
112
--> $DIR/promoted_const_call.rs:10:30
123
|
@@ -57,7 +48,7 @@ LL | let _: &'static _ = &&(Panic, 0).1;
5748
LL | }
5849
| - temporary value is freed at the end of this statement
5950

60-
error: aborting due to 6 previous errors
51+
error: aborting due to 5 previous errors
6152

6253
Some errors have detailed explanations: E0493, E0716.
6354
For more information about an error, try `rustc --explain E0493`.

‎tests/ui/dropck/const_drop_is_valid.rs

-8
This file was deleted.

‎tests/ui/dropck/const_drop_is_valid.stderr

-31
This file was deleted.

0 commit comments

Comments
 (0)