nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

E0379: Make diagnostic more precise

Browse Source
This commit is contained in:
León Orell Valerian Liehr 2024-01-02 00:26:50 +01:00
parent 8f546aa495
commit ae8e401c9f
No known key found for this signature in database
GPG Key ID: D17A07215F68E713
13 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_ast_passes/messages.ftl
View File

@ -233,8 +233,14 @@ ast_passes_tilde_const_disallowed = `~const` is not allowed here
.item = this item cannot have `~const` trait bounds .item = this item cannot have `~const` trait bounds
ast_passes_trait_fn_const = ast_passes_trait_fn_const =
functions in traits cannot be declared const functions in {$in_impl ->
.label = functions in traits cannot be const [true] trait impls
*[false] traits
} cannot be declared const
.label = functions in {$in_impl ->
[true] trait impls
*[false] traits
} cannot be const
ast_passes_trait_object_single_bound = only a single explicit lifetime bound is permitted ast_passes_trait_object_single_bound = only a single explicit lifetime bound is permitted

2
compiler/rustc_ast_passes/src/ast_validation.rs
View File

@ -293,7 +293,7 @@ impl<'a> AstValidator<'a> {
fn check_trait_fn_not_const(&self, constness: Const) { fn check_trait_fn_not_const(&self, constness: Const) {
if let Const::Yes(span) = constness { if let Const::Yes(span) = constness {
self.dcx().emit_err(errors::TraitFnConst { span }); self.dcx().emit_err(errors::TraitFnConst { span, in_impl: self.in_trait_impl });
} }
} }

1
compiler/rustc_ast_passes/src/errors.rs
View File

@ -49,6 +49,7 @@ pub struct TraitFnConst {
#[primary_span] #[primary_span]
#[label] #[label]
pub span: Span, pub span: Span,
pub in_impl: bool,
} }
#[derive(Diagnostic)] #[derive(Diagnostic)]

4
compiler/rustc_error_codes/src/error_codes/E0379.md
View File

@ -6,6 +6,10 @@ Erroneous code example:
trait Foo { trait Foo {
const fn bar() -> u32; // error! const fn bar() -> u32; // error!
} }
impl Foo for () {
const fn bar() -> u32 { 0 } // error!
}
``` ```
Trait methods cannot be declared `const` by design. For more information, see Trait methods cannot be declared `const` by design. For more information, see

2
tests/ui/consts/const-fn-mismatch.rs
View File

@ -9,7 +9,7 @@ trait Foo {
impl Foo for u32 { impl Foo for u32 {
const fn f() -> u32 { const fn f() -> u32 {
//~^ ERROR functions in traits cannot be declared const //~^ ERROR functions in trait impls cannot be declared const
22 22
} }
} }

4
tests/ui/consts/const-fn-mismatch.stderr
View File

@ -1,8 +1,8 @@
error[E0379]: functions in traits cannot be declared const error[E0379]: functions in trait impls cannot be declared const
--> $DIR/const-fn-mismatch.rs:11:5 --> $DIR/const-fn-mismatch.rs:11:5
| |
LL | const fn f() -> u32 { LL | const fn f() -> u32 {
| ^^^^^ functions in traits cannot be const | ^^^^^ functions in trait impls cannot be const
error: aborting due to 1 previous error error: aborting due to 1 previous error

2
tests/ui/feature-gates/feature-gate-min_const_fn.rs
View File

@ -8,7 +8,7 @@ trait Foo {
} }
impl Foo for u32 { impl Foo for u32 {
const fn foo() -> u32 { 0 } //~ ERROR functions in traits cannot be declared const const fn foo() -> u32 { 0 } //~ ERROR functions in trait impls cannot be declared const
} }
trait Bar {} trait Bar {}

4
tests/ui/feature-gates/feature-gate-min_const_fn.stderr
View File

@ -10,11 +10,11 @@ error[E0379]: functions in traits cannot be declared const
LL | const fn bar() -> u32 { 0 } LL | const fn bar() -> u32 { 0 }
| ^^^^^ functions in traits cannot be const | ^^^^^ functions in traits cannot be const
error[E0379]: functions in traits cannot be declared const error[E0379]: functions in trait impls cannot be declared const
--> $DIR/feature-gate-min_const_fn.rs:11:5 --> $DIR/feature-gate-min_const_fn.rs:11:5
| |
LL | const fn foo() -> u32 { 0 } LL | const fn foo() -> u32 { 0 }
| ^^^^^ functions in traits cannot be const | ^^^^^ functions in trait impls cannot be const
error: aborting due to 3 previous errors error: aborting due to 3 previous errors

4
tests/ui/mismatched_types/const-fn-in-trait.stderr
View File

@ -4,11 +4,11 @@ error[E0379]: functions in traits cannot be declared const
LL | const fn g(); LL | const fn g();
| ^^^^^ functions in traits cannot be const | ^^^^^ functions in traits cannot be const
error[E0379]: functions in traits cannot be declared const error[E0379]: functions in trait impls cannot be declared const
--> $DIR/const-fn-in-trait.rs:7:5 --> $DIR/const-fn-in-trait.rs:7:5
| |
LL | const fn f() -> u32 { 22 } LL | const fn f() -> u32 { 22 }
| ^^^^^ functions in traits cannot be const | ^^^^^ functions in trait impls cannot be const
error: aborting due to 2 previous errors error: aborting due to 2 previous errors

4
tests/ui/parser/fn-header-semantic-fail.rs
View File

@ -26,10 +26,10 @@ fn main() {
impl X for Y { impl X for Y {
async fn ft1() {} // OK. async fn ft1() {} // OK.
unsafe fn ft2() {} // OK. unsafe fn ft2() {} // OK.
const fn ft3() {} //~ ERROR functions in traits cannot be declared const const fn ft3() {} //~ ERROR functions in trait impls cannot be declared const
extern "C" fn ft4() {} extern "C" fn ft4() {}
const async unsafe extern "C" fn ft5() {} const async unsafe extern "C" fn ft5() {}
//~^ ERROR functions in traits cannot be declared const //~^ ERROR functions in trait impls cannot be declared const
//~| ERROR functions cannot be both `const` and `async` //~| ERROR functions cannot be both `const` and `async`
} }

8
tests/ui/parser/fn-header-semantic-fail.stderr
View File

@ -28,17 +28,17 @@ LL | const async unsafe extern "C" fn ft5();
| | `async` because of this | | `async` because of this
| `const` because of this | `const` because of this
error[E0379]: functions in traits cannot be declared const error[E0379]: functions in trait impls cannot be declared const
--> $DIR/fn-header-semantic-fail.rs:29:9 --> $DIR/fn-header-semantic-fail.rs:29:9
| |
LL | const fn ft3() {} LL | const fn ft3() {}
| ^^^^^ functions in traits cannot be const | ^^^^^ functions in trait impls cannot be const
error[E0379]: functions in traits cannot be declared const error[E0379]: functions in trait impls cannot be declared const
--> $DIR/fn-header-semantic-fail.rs:31:9 --> $DIR/fn-header-semantic-fail.rs:31:9
| |
LL | const async unsafe extern "C" fn ft5() {} LL | const async unsafe extern "C" fn ft5() {}
| ^^^^^ functions in traits cannot be const | ^^^^^ functions in trait impls cannot be const
error: functions cannot be both `const` and `async` error: functions cannot be both `const` and `async`
--> $DIR/fn-header-semantic-fail.rs:31:9 --> $DIR/fn-header-semantic-fail.rs:31:9

2
tests/ui/rfcs/rfc-2632-const-trait-impl/effects/trait-fn-const.rs
View File

@ -7,7 +7,7 @@ trait Trait {
} }
impl const Trait for () { impl const Trait for () {
const fn fun() {} //~ ERROR functions in traits cannot be declared const const fn fun() {} //~ ERROR functions in trait impls cannot be declared const
} }
fn main() {} fn main() {}

4
tests/ui/rfcs/rfc-2632-const-trait-impl/effects/trait-fn-const.stderr
View File

@ -4,11 +4,11 @@ error[E0379]: functions in traits cannot be declared const
LL | const fn fun(); LL | const fn fun();
| ^^^^^ functions in traits cannot be const | ^^^^^ functions in traits cannot be const
error[E0379]: functions in traits cannot be declared const error[E0379]: functions in trait impls cannot be declared const
--> $DIR/trait-fn-const.rs:10:5 --> $DIR/trait-fn-const.rs:10:5
| |
LL | const fn fun() {} LL | const fn fun() {}
| ^^^^^ functions in traits cannot be const | ^^^^^ functions in trait impls cannot be const
error: aborting due to 2 previous errors error: aborting due to 2 previous errors