Skip to content

Commit 853ca8c

Browse files
estebankestebank
committed
reword messages and add more test cases for stable/nightly and feature enabled/disabled
1 parent a5c24ef commit 853ca8c

36 files changed

+732
-93
lines changed

‎compiler/rustc_hir_analysis/messages.ftl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ hir_analysis_coercion_between_struct_single_note = expected a single field to be
9999
hir_analysis_const_bound_for_non_const_trait = `{$modifier}` can only be applied to `#[const_trait]` traits
100100
.label = can't be applied to `{$trait_name}`
101101
.note = `{$trait_name}` can't be used with `{$modifier}` because it isn't annotated with `#[const_trait]`
102-
.suggestion = mark `{$trait_name}` as `const`
102+
.suggestion = {$suggestion_pre}mark `{$trait_name}` as `#[const_trait]` to allow it to have `const` implementations
103103
104104
hir_analysis_const_impl_for_non_const_trait = const `impl` for trait `{$trait_name}` which is not marked with `#[const_trait]`
105-
.label = not marked with `#[const_trait]`
106-
.suggestion = mark `{$trait_name}` as `const`
105+
.label = this trait is not `const`
106+
.suggestion = {$suggestion_pre}mark `{$trait_name}` as `#[const_trait]` to allow it to have `const` implementations
107107
.note = marking a trait with `#[const_trait]` ensures all default method bodies are `const`
108108
.adding = adding a non-const method body in the future would be a breaking change
109109

‎compiler/rustc_hir_analysis/src/collect.rs‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,11 +1637,23 @@ fn check_impl_constness(
16371637
}
16381638

16391639
let trait_name = tcx.item_name(trait_def_id).to_string();
1640+
let (local_trait_span, suggestion_pre) =
1641+
match (trait_def_id.is_local(), tcx.sess.is_nightly_build()) {
1642+
(true, true) => (
1643+
Some(tcx.def_span(trait_def_id).shrink_to_lo()),
1644+
if tcx.features().const_trait_impl() {
1645+
""
1646+
} else {
1647+
"enable `#![feature(const_trait_impl)]` in your crate and "
1648+
},
1649+
),
1650+
(false, _) | (_, false) => (None, ""),
1651+
};
16401652
Some(tcx.dcx().emit_err(errors::ConstImplForNonConstTrait {
16411653
trait_ref_span: hir_trait_ref.path.span,
16421654
trait_name,
1643-
local_trait_span:
1644-
trait_def_id.as_local().map(|_| tcx.def_span(trait_def_id).shrink_to_lo()),
1655+
local_trait_span,
1656+
suggestion_pre,
16451657
marking: (),
16461658
adding: (),
16471659
}))

‎compiler/rustc_hir_analysis/src/errors.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ pub(crate) struct ConstImplForNonConstTrait {
539539
style = "verbose"
540540
)]
541541
pub local_trait_span: Option<Span>,
542+
pub suggestion_pre: &'static str,
542543
#[note]
543544
pub marking: (),
544545
#[note(hir_analysis_adding)]
@@ -554,6 +555,7 @@ pub(crate) struct ConstBoundForNonConstTrait {
554555
pub modifier: &'static str,
555556
#[note]
556557
pub def_span: Option<Span>,
558+
pub suggestion_pre: &'static str,
557559
#[suggestion(
558560
applicability = "machine-applicable",
559561
code = "#[const_trait] ",

‎compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -737,16 +737,25 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
737737
if let hir::BoundConstness::Always(span) | hir::BoundConstness::Maybe(span) = constness
738738
&& !self.tcx().is_const_trait(trait_def_id)
739739
{
740-
let (def_span, suggestion) = if trait_def_id.is_local() {
741-
(None, Some(tcx.def_span(trait_def_id).shrink_to_lo()))
742-
} else {
743-
(Some(tcx.def_span(trait_def_id)), None)
744-
};
740+
let (def_span, suggestion, suggestion_pre) =
741+
match (trait_def_id.is_local(), self.tcx().sess.is_nightly_build()) {
742+
(true, true) => (
743+
None,
744+
Some(tcx.def_span(trait_def_id).shrink_to_lo()),
745+
if self.tcx().features().const_trait_impl() {
746+
""
747+
} else {
748+
"enable `#![feature(const_trait_impl)]` in your crate and "
749+
},
750+
),
751+
(false, _) | (_, false) => (Some(tcx.def_span(trait_def_id)), None, ""),
752+
};
745753
self.dcx().emit_err(crate::errors::ConstBoundForNonConstTrait {
746754
span,
747755
modifier: constness.as_str(),
748756
def_span,
749757
trait_name: self.tcx().def_path_str(trait_def_id),
758+
suggestion_pre,
750759
suggestion,
751760
});
752761
}

‎tests/run-make/const-trait-stable-toolchain/const-super-trait.nightly.disabled.stderr‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
error: `~const` is not allowed here
2+
--> const-super-trait.rs:7:12
3+
|
4+
LL | trait Bar: ~const Foo {}
5+
| ^^^^^^
6+
|
7+
note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
8+
--> const-super-trait.rs:7:1
9+
|
10+
LL | trait Bar: ~const Foo {}
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^
12+
13+
error[E0658]: const trait impls are experimental
14+
--> const-super-trait.rs:7:12
15+
|
16+
LL | trait Bar: ~const Foo {}
17+
| ^^^^^^
18+
|
19+
= note: see issue #67792 <https://github.com/rust-lang/rust/issues/67792> for more information
20+
= help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
21+
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
22+
23+
error[E0658]: const trait impls are experimental
24+
--> const-super-trait.rs:9:17
25+
|
26+
LL | const fn foo<T: ~const Bar>(x: &T) {
27+
| ^^^^^^
28+
|
29+
= note: see issue #67792 <https://github.com/rust-lang/rust/issues/67792> for more information
30+
= help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
31+
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
32+
33+
error: `~const` can only be applied to `#[const_trait]` traits
34+
--> const-super-trait.rs:7:12
35+
|
36+
LL | trait Bar: ~const Foo {}
37+
| ^^^^^^ can't be applied to `Foo`
38+
|
39+
help: enable `#![feature(const_trait_impl)]` in your crate and mark `Foo` as `#[const_trait]` to allow it to have `const` implementations
40+
|
41+
LL | #[const_trait] trait Foo {
42+
| ++++++++++++++
43+
44+
error: `~const` can only be applied to `#[const_trait]` traits
45+
--> const-super-trait.rs:9:17
46+
|
47+
LL | const fn foo<T: ~const Bar>(x: &T) {
48+
| ^^^^^^ can't be applied to `Bar`
49+
|
50+
help: enable `#![feature(const_trait_impl)]` in your crate and mark `Bar` as `#[const_trait]` to allow it to have `const` implementations
51+
|
52+
LL | #[const_trait] trait Bar: ~const Foo {}
53+
| ++++++++++++++
54+
55+
error[E0015]: cannot call non-const fn `<T as Foo>::a` in constant functions
56+
--> const-super-trait.rs:10:7
57+
|
58+
LL | x.a();
59+
| ^^^
60+
|
61+
= note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
62+
63+
error: aborting due to 6 previous errors
64+
65+
Some errors have detailed explanations: E0015, E0658.
66+
For more information about an error, try `rustc --explain E0015`.

‎tests/run-make/const-trait-stable-toolchain/const-super-trait.nightly.enabled.stderr‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
error: `~const` is not allowed here
2+
--> const-super-trait.rs:7:12
3+
|
4+
LL | trait Bar: ~const Foo {}
5+
| ^^^^^^
6+
|
7+
note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
8+
--> const-super-trait.rs:7:1
9+
|
10+
LL | trait Bar: ~const Foo {}
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^
12+
13+
error: `~const` can only be applied to `#[const_trait]` traits
14+
--> const-super-trait.rs:7:12
15+
|
16+
LL | trait Bar: ~const Foo {}
17+
| ^^^^^^ can't be applied to `Foo`
18+
|
19+
help: mark `Foo` as `#[const_trait]` to allow it to have `const` implementations
20+
|
21+
LL | #[const_trait] trait Foo {
22+
| ++++++++++++++
23+
24+
error: `~const` can only be applied to `#[const_trait]` traits
25+
--> const-super-trait.rs:9:17
26+
|
27+
LL | const fn foo<T: ~const Bar>(x: &T) {
28+
| ^^^^^^ can't be applied to `Bar`
29+
|
30+
help: mark `Bar` as `#[const_trait]` to allow it to have `const` implementations
31+
|
32+
LL | #[const_trait] trait Bar: ~const Foo {}
33+
| ++++++++++++++
34+
35+
error[E0015]: cannot call non-const fn `<T as Foo>::a` in constant functions
36+
--> const-super-trait.rs:10:7
37+
|
38+
LL | x.a();
39+
| ^^^
40+
|
41+
= note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
42+
43+
error: aborting due to 4 previous errors
44+
45+
For more information about this error, try `rustc --explain E0015`.

‎tests/run-make/const-trait-stable-toolchain/const-super-trait.rs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#![cfg_attr(feature_enabled, feature(const_trait_impl))]
2+
3+
trait Foo {
4+
fn a(&self);
5+
}
6+
7+
trait Bar: ~const Foo {}
8+
9+
const fn foo<T: ~const Bar>(x: &T) {
10+
x.a();
11+
}
12+
13+
fn main() {}

‎tests/run-make/const-trait-stable-toolchain/const-super-trait.stable.disabled.stderr‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
error: `~const` is not allowed here
2+
--> const-super-trait.rs:7:12
3+
|
4+
7 | trait Bar: ~const Foo {}
5+
| ^^^^^^
6+
|
7+
note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
8+
--> const-super-trait.rs:7:1
9+
|
10+
7 | trait Bar: ~const Foo {}
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^
12+
13+
error[E0658]: const trait impls are experimental
14+
--> const-super-trait.rs:7:12
15+
|
16+
7 | trait Bar: ~const Foo {}
17+
| ^^^^^^
18+
|
19+
= note: see issue #67792 <https://github.com/rust-lang/rust/issues/67792> for more information
20+
21+
error[E0658]: const trait impls are experimental
22+
--> const-super-trait.rs:9:17
23+
|
24+
9 | const fn foo<T: ~const Bar>(x: &T) {
25+
| ^^^^^^
26+
|
27+
= note: see issue #67792 <https://github.com/rust-lang/rust/issues/67792> for more information
28+
29+
error: `~const` can only be applied to `#[const_trait]` traits
30+
--> const-super-trait.rs:7:12
31+
|
32+
7 | trait Bar: ~const Foo {}
33+
| ^^^^^^ can't be applied to `Foo`
34+
|
35+
note: `Foo` can't be used with `~const` because it isn't annotated with `#[const_trait]`
36+
--> const-super-trait.rs:3:1
37+
|
38+
3 | trait Foo {
39+
| ^^^^^^^^^
40+
41+
error: `~const` can only be applied to `#[const_trait]` traits
42+
--> const-super-trait.rs:9:17
43+
|
44+
9 | const fn foo<T: ~const Bar>(x: &T) {
45+
| ^^^^^^ can't be applied to `Bar`
46+
|
47+
note: `Bar` can't be used with `~const` because it isn't annotated with `#[const_trait]`
48+
--> const-super-trait.rs:7:1
49+
|
50+
7 | trait Bar: ~const Foo {}
51+
| ^^^^^^^^^^^^^^^^^^^^^
52+
53+
error[E0015]: cannot call non-const fn `<T as Foo>::a` in constant functions
54+
--> const-super-trait.rs:10:7
55+
|
56+
10 | x.a();
57+
| ^^^
58+
|
59+
= note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
60+
61+
error: aborting due to 6 previous errors
62+
63+
Some errors have detailed explanations: E0015, E0658.
64+
For more information about an error, try `rustc --explain E0015`.

‎tests/run-make/const-trait-stable-toolchain/const-super-trait.stable.enabled.stderr‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
error: `~const` is not allowed here
2+
--> const-super-trait.rs:7:12
3+
|
4+
7 | trait Bar: ~const Foo {}
5+
| ^^^^^^
6+
|
7+
note: this trait is not a `#[const_trait]`, so it cannot have `~const` trait bounds
8+
--> const-super-trait.rs:7:1
9+
|
10+
7 | trait Bar: ~const Foo {}
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^
12+
13+
error[E0554]: `#![feature]` may not be used on the dev release channel
14+
--> const-super-trait.rs:1:30
15+
|
16+
1 | #![cfg_attr(feature_enabled, feature(const_trait_impl))]
17+
| ^^^^^^^^^^^^^^^^^^^^^^^^^
18+
19+
error: `~const` can only be applied to `#[const_trait]` traits
20+
--> const-super-trait.rs:7:12
21+
|
22+
7 | trait Bar: ~const Foo {}
23+
| ^^^^^^ can't be applied to `Foo`
24+
|
25+
note: `Foo` can't be used with `~const` because it isn't annotated with `#[const_trait]`
26+
--> const-super-trait.rs:3:1
27+
|
28+
3 | trait Foo {
29+
| ^^^^^^^^^
30+
31+
error: `~const` can only be applied to `#[const_trait]` traits
32+
--> const-super-trait.rs:9:17
33+
|
34+
9 | const fn foo<T: ~const Bar>(x: &T) {
35+
| ^^^^^^ can't be applied to `Bar`
36+
|
37+
note: `Bar` can't be used with `~const` because it isn't annotated with `#[const_trait]`
38+
--> const-super-trait.rs:7:1
39+
|
40+
7 | trait Bar: ~const Foo {}
41+
| ^^^^^^^^^^^^^^^^^^^^^
42+
43+
error[E0015]: cannot call non-const fn `<T as Foo>::a` in constant functions
44+
--> const-super-trait.rs:10:7
45+
|
46+
10 | x.a();
47+
| ^^^
48+
|
49+
= note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
50+
51+
error: aborting due to 5 previous errors
52+
53+
Some errors have detailed explanations: E0015, E0554.
54+
For more information about an error, try `rustc --explain E0015`.

‎tests/run-make/const-trait-stable-toolchain/rmake.rs‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
// Test output of const super trait errors in both stable and nightly.
2+
// We don't want to provide suggestions on stable that only make sense in nightly.
3+
4+
use run_make_support::{diff, rustc};
5+
6+
fn main() {
7+
let out = rustc()
8+
.input("const-super-trait.rs")
9+
.env("RUSTC_BOOTSTRAP", "-1")
10+
.cfg("feature_enabled")
11+
.run_fail()
12+
.assert_stderr_not_contains("as `#[const_trait]` to allow it to have `const` implementations")
13+
.stderr_utf8();
14+
diff()
15+
.expected_file("const-super-trait.stable.enabled.stderr")
16+
.actual_text("(rustc)", &out)
17+
.run();
18+
let out = rustc()
19+
.input("const-super-trait.rs")
20+
.cfg("feature_enabled")
21+
.ui_testing()
22+
.run_fail()
23+
.assert_stderr_not_contains("enable `#![feature(const_trait_impl)]` in your crate and mark")
24+
.assert_stderr_contains("as `#[const_trait]` to allow it to have `const` implementations")
25+
.stderr_utf8();
26+
diff()
27+
.expected_file("const-super-trait.nightly.enabled.stderr")
28+
.actual_text("(rustc)", &out)
29+
.run();
30+
let out = rustc()
31+
.input("const-super-trait.rs")
32+
.env("RUSTC_BOOTSTRAP", "-1")
33+
.run_fail()
34+
.assert_stderr_not_contains("enable `#![feature(const_trait_impl)]` in your crate and mark")
35+
.assert_stderr_not_contains("as `#[const_trait]` to allow it to have `const` implementations")
36+
.stderr_utf8();
37+
diff()
38+
.expected_file("const-super-trait.stable.disabled.stderr")
39+
.actual_text("(rustc)", &out)
40+
.run();
41+
let out = rustc()
42+
.input("const-super-trait.rs")
43+
.ui_testing()
44+
.run_fail()
45+
.assert_stderr_contains("enable `#![feature(const_trait_impl)]` in your crate and mark")
46+
.stderr_utf8();
47+
diff()
48+
.expected_file("const-super-trait.nightly.disabled.stderr")
49+
.actual_text("(rustc)", &out)
50+
.run();
51+
}

0 commit comments

Comments
 (0)