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

Further tweak spans in ast validation errors

Browse Source
This commit is contained in:
Esteban Küber 2020-03-06 10:55:21 -08:00
parent 713a291441
commit 6fba412499
11 changed files with 91 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/librustc_ast_passes/ast_validation.rs
View File

@ -13,7 +13,7 @@ use rustc_ast::visit::{self, AssocCtxt, FnCtxt, FnKind, Visitor};
use rustc_ast::walk_list;
use rustc_ast_pretty::pprust;
use rustc_data_structures::fx::FxHashMap;
use rustc_errors::{error_code, struct_span_err, Applicability};
use rustc_errors::{error_code, pluralize, struct_span_err, Applicability};
use rustc_parse::validate_attr;
use rustc_session::lint::builtin::PATTERNS_IN_FNS_WITHOUT_BODY;
use rustc_session::lint::LintBuffer;
@ -887,30 +887,63 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
if is_auto == IsAuto::Yes {
// Auto traits cannot have generics, super traits nor contain items.
if !generics.params.is_empty() {
struct_span_err!(
let spans: Vec<_> = generics.params.iter().map(|i| i.ident.span).collect();
let last = spans.iter().last().map(|s| *s);
let len = spans.len();
let mut err = struct_span_err!(
self.session,
item.span,
spans,
E0567,
"auto traits cannot have generic parameters"
)
.emit();
);
if let Some(span) = last {
err.span_label(
span,
&format!(
"cannot have {these} generic parameter{s}",
these = if len == 1 { "this" } else { "these" },
s = pluralize!(len)
),
);
}
err.span_label(
item.ident.span,
"auto trait cannot have generic parameters",
);
err.emit();
}
if !bounds.is_empty() {
struct_span_err!(
let spans: Vec<_> = bounds.iter().map(|b| b.span()).collect();
let last = spans.iter().last().map(|s| *s);
let len = spans.len();
let mut err = struct_span_err!(
self.session,
item.span,
spans,
E0568,
"auto traits cannot have super traits"
)
.emit();
);
if let Some(span) = last {
err.span_label(
span,
&format!(
"cannot have {these} super trait{s}",
these = if len == 1 { "this" } else { "these" },
s = pluralize!(len)
),
);
}
err.span_label(item.ident.span, "auto trait cannot have super traits");
err.emit();
}
if !trait_items.is_empty() {
let spans: Vec<_> = trait_items.iter().map(|i| i.ident.span).collect();
struct_span_err!(
self.session,
item.span,
spans,
E0380,
"auto traits cannot have methods or associated items"
)
.span_label(item.ident.span, "auto trait cannot have items")
.emit();
}
}
@ -1157,9 +1190,13 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
}) = fk.header()
{
self.err_handler()
.struct_span_err(span, "functions cannot be both `const` and `async`")
.struct_span_err(
vec![*cspan, *aspan],
"functions cannot be both `const` and `async`",
)
.span_label(*cspan, "`const` because of this")
.span_label(*aspan, "`async` because of this")
.span_label(span, "") // Point at the fn header.
.emit();
}

4
src/test/ui/async-await/no-const-async.stderr
View File

@ -1,8 +1,8 @@
error: functions cannot be both `const` and `async`
--> $DIR/no-const-async.rs:4:1
--> $DIR/no-const-async.rs:4:5
|
LL | pub const async fn x() {}
| ^^^^-----^-----^^^^^^^^^^
| ----^^^^^-^^^^^----------
| | |
| | `async` because of this
| `const` because of this

18
src/test/ui/auto-trait-validation.stderr
View File

@ -1,20 +1,26 @@
error[E0567]: auto traits cannot have generic parameters
--> $DIR/auto-trait-validation.rs:3:1
--> $DIR/auto-trait-validation.rs:3:20
|
LL | auto trait Generic<T> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^
| ------- ^ cannot have this generic parameter
| |
| auto trait cannot have generic parameters
error[E0568]: auto traits cannot have super traits
--> $DIR/auto-trait-validation.rs:5:1
--> $DIR/auto-trait-validation.rs:5:20
|
LL | auto trait Bound : Copy {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
| ----- ^^^^ cannot have this super trait
| |
| auto trait cannot have super traits
error[E0380]: auto traits cannot have methods or associated items
--> $DIR/auto-trait-validation.rs:7:1
--> $DIR/auto-trait-validation.rs:7:25
|
LL | auto trait MyTrait { fn foo() {} }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ------- ^^^
| |
| auto trait cannot have items
error: aborting due to 3 previous errors

3
src/test/ui/issues/issue-23080-2.rs
View File

@ -3,8 +3,7 @@
#![feature(optin_builtin_traits)]
unsafe auto trait Trait {
//~^ ERROR E0380
type Output;
type Output; //~ ERROR E0380
}
fn call_method<T: Trait>(x: T) {}

11
src/test/ui/issues/issue-23080-2.stderr
View File

@ -1,11 +1,10 @@
error[E0380]: auto traits cannot have methods or associated items
--> $DIR/issue-23080-2.rs:5:1
--> $DIR/issue-23080-2.rs:6:10
|
LL | / unsafe auto trait Trait {
LL | |
LL | | type Output;
LL | | }
| |_^
LL | unsafe auto trait Trait {
| ----- auto trait cannot have items
LL | type Output;
| ^^^^^^
error[E0275]: overflow evaluating the requirement `<() as Trait>::Output`
|

3
src/test/ui/issues/issue-23080.rs
View File

@ -1,8 +1,7 @@
#![feature(optin_builtin_traits)]
unsafe auto trait Trait {
//~^ ERROR E0380
fn method(&self) {
fn method(&self) { //~ ERROR E0380
println!("Hello");
}
}

13
src/test/ui/issues/issue-23080.stderr
View File

@ -1,13 +1,10 @@
error[E0380]: auto traits cannot have methods or associated items
--> $DIR/issue-23080.rs:3:1
--> $DIR/issue-23080.rs:4:8
|
LL | / unsafe auto trait Trait {
LL | |
LL | | fn method(&self) {
LL | | println!("Hello");
LL | | }
LL | | }
| |_^
LL | unsafe auto trait Trait {
| ----- auto trait cannot have items
LL | fn method(&self) {
| ^^^^^^
error: aborting due to previous error

10
src/test/ui/parser/fn-header-semantic-fail.stderr
View File

@ -2,7 +2,7 @@ error: functions cannot be both `const` and `async`
--> $DIR/fn-header-semantic-fail.rs:13:5
|
LL | const async unsafe extern "C" fn ff5() {} // OK.
| -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^-^^^^^------------------------------
| | |
| | `async` because of this
| `const` because of this
@ -45,7 +45,7 @@ error: functions cannot be both `const` and `async`
--> $DIR/fn-header-semantic-fail.rs:21:9
|
LL | const async unsafe extern "C" fn ft5();
| -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^-^^^^^----------------------------
| | |
| | `async` because of this
| `const` because of this
@ -88,7 +88,7 @@ error: functions cannot be both `const` and `async`
--> $DIR/fn-header-semantic-fail.rs:34:9
|
LL | const async unsafe extern "C" fn ft5() {}
| -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^-^^^^^------------------------------
| | |
| | `async` because of this
| `const` because of this
@ -97,7 +97,7 @@ error: functions cannot be both `const` and `async`
--> $DIR/fn-header-semantic-fail.rs:46:9
|
LL | const async unsafe extern "C" fn fi5() {}
| -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^-^^^^^------------------------------
| | |
| | `async` because of this
| `const` because of this
@ -160,7 +160,7 @@ error: functions cannot be both `const` and `async`
--> $DIR/fn-header-semantic-fail.rs:55:9
|
LL | const async unsafe extern "C" fn fe5();
| -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ^^^^^-^^^^^----------------------------
| | |
| | `async` because of this
| `const` because of this

6
src/test/ui/traits/traits-inductive-overflow-supertrait-oibit.stderr
View File

@ -1,8 +1,10 @@
error[E0568]: auto traits cannot have super traits
--> $DIR/traits-inductive-overflow-supertrait-oibit.rs:7:1
--> $DIR/traits-inductive-overflow-supertrait-oibit.rs:7:19
|
LL | auto trait Magic: Copy {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^
| ----- ^^^^ cannot have this super trait
| |
| auto trait cannot have super traits
error[E0277]: the trait bound `NoClone: std::marker::Copy` is not satisfied
--> $DIR/traits-inductive-overflow-supertrait-oibit.rs:15:23

6
src/test/ui/typeck/typeck-auto-trait-no-supertraits-2.stderr
View File

@ -1,8 +1,10 @@
error[E0568]: auto traits cannot have super traits
--> $DIR/typeck-auto-trait-no-supertraits-2.rs:3:1
--> $DIR/typeck-auto-trait-no-supertraits-2.rs:3:20
|
LL | auto trait Magic : Sized where Option<Self> : Magic {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
| ----- ^^^^^ cannot have this super trait
| |
| auto trait cannot have super traits
error: aborting due to previous error

6
src/test/ui/typeck/typeck-auto-trait-no-supertraits.stderr
View File

@ -1,8 +1,10 @@
error[E0568]: auto traits cannot have super traits
--> $DIR/typeck-auto-trait-no-supertraits.rs:27:1
--> $DIR/typeck-auto-trait-no-supertraits.rs:27:19
|
LL | auto trait Magic: Copy {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^
| ----- ^^^^ cannot have this super trait
| |
| auto trait cannot have super traits
error: aborting due to previous error