dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #114830 - compiler-errors:ui-test-annotations, r=petrochenkov 

Clean up some bad UI testing annotations

These annotations do nothing 😅
This commit is contained in:
Guillaume Gomez 2023-08-15 14:29:50 +02:00 committed by GitHub
parent da4e7bd0cd dc946649f5
commit 81efd47aa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/ui/generic-associated-types/issue-86218.rs
View File

@ -17,7 +17,6 @@ trait Yay<AdditionalValue> {
impl<'a> Yay<&'a ()> for () {
type InnerStream<'s> = impl Stream<Item = i32> + 's;
//^ ERROR does not fulfill the required lifetime
fn foo<'s>() -> Self::InnerStream<'s> {
()
}

1
tests/ui/generic-associated-types/issue-90014-tait.rs
View File

@ -13,7 +13,6 @@ struct Foo<'a>(&'a mut ());
impl Foo<'_> {
type Fut<'a> = impl Future<Output = ()>;
//^ ERROR: the type `&mut ()` does not fulfill the required lifetime
fn make_fut<'a>(&'a self) -> Self::Fut<'a> {
async { () }

8
tests/ui/generic-associated-types/issue-90014-tait.stderr
View File

@ -1,18 +1,18 @@
error[E0308]: mismatched types
--> $DIR/issue-90014-tait.rs:19:9
--> $DIR/issue-90014-tait.rs:18:9
|
LL | type Fut<'a> = impl Future<Output = ()>;
| ------------------------ the expected future
...
LL |
LL | fn make_fut<'a>(&'a self) -> Self::Fut<'a> {
| ------------- expected `Foo<'_>::Fut<'a>` because of return type
LL | async { () }
| ^^^^^^^^^^^^ expected future, found `async` block
|
= note: expected opaque type `Foo<'_>::Fut<'a>`
found `async` block `[async block@$DIR/issue-90014-tait.rs:19:9: 19:21]`
found `async` block `[async block@$DIR/issue-90014-tait.rs:18:9: 18:21]`
note: this item must have the opaque type in its signature in order to be able to register hidden types
--> $DIR/issue-90014-tait.rs:18:8
--> $DIR/issue-90014-tait.rs:17:8
|
LL | fn make_fut<'a>(&'a self) -> Self::Fut<'a> {
| ^^^^^^^^

2
tests/ui/internal/internal-unstable.rs
View File

@ -8,7 +8,6 @@ extern crate internal_unstable;
struct Baz {
#[allow_internal_unstable]
//^ WARN `#[allow_internal_unstable]` is ignored on struct fields and match arms
baz: u8,
}
@ -50,7 +49,6 @@ fn main() {
match true {
#[allow_internal_unstable]
//^ WARN `#[allow_internal_unstable]` is ignored on struct fields and match arms
_ => {}
}
}

10
tests/ui/internal/internal-unstable.stderr
View File

@ -1,5 +1,5 @@
error[E0658]: use of unstable library feature 'function'
--> $DIR/internal-unstable.rs:41:25
--> $DIR/internal-unstable.rs:40:25
|
LL | pass_through_allow!(internal_unstable::unstable());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -7,7 +7,7 @@ LL | pass_through_allow!(internal_unstable::unstable());
= help: add `#![feature(function)]` to the crate attributes to enable
error[E0658]: use of unstable library feature 'function'
--> $DIR/internal-unstable.rs:43:27
--> $DIR/internal-unstable.rs:42:27
|
LL | pass_through_noallow!(internal_unstable::unstable());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -15,7 +15,7 @@ LL | pass_through_noallow!(internal_unstable::unstable());
= help: add `#![feature(function)]` to the crate attributes to enable
error[E0658]: use of unstable library feature 'function'
--> $DIR/internal-unstable.rs:47:22
--> $DIR/internal-unstable.rs:46:22
|
LL | println!("{:?}", internal_unstable::unstable());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -23,7 +23,7 @@ LL | println!("{:?}", internal_unstable::unstable());
= help: add `#![feature(function)]` to the crate attributes to enable
error[E0658]: use of unstable library feature 'function'
--> $DIR/internal-unstable.rs:49:10
--> $DIR/internal-unstable.rs:48:10
|
LL | bar!(internal_unstable::unstable());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@ -31,7 +31,7 @@ LL | bar!(internal_unstable::unstable());
= help: add `#![feature(function)]` to the crate attributes to enable
error[E0658]: use of unstable library feature 'function'
--> $DIR/internal-unstable.rs:19:9
--> $DIR/internal-unstable.rs:18:9
|
LL | internal_unstable::unstable();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^

8
tests/ui/parser/issues/issue-70583-block-is-empty-2.rs
View File

@ -6,9 +6,13 @@ pub enum ErrorHandled {
impl ErrorHandled {
pub fn assert_reported(self) {
match self {
//~^ NOTE this delimiter might not be properly closed...
ErrorHandled::Reported => {}}
//^~ ERROR block is empty, you might have not meant to close it
//~^ NOTE block is empty, you might have not meant to close it
//~| NOTE as it matches this but it has different indentation
ErrorHandled::TooGeneric => panic!(),
}
}
} //~ ERROR unexpected closing delimiter: `}`
}
//~^ ERROR unexpected closing delimiter: `}`
//~| NOTE unexpected closing delimiter

3
tests/ui/parser/issues/issue-70583-block-is-empty-2.stderr
View File

@ -1,8 +1,9 @@
error: unexpected closing delimiter: `}`
--> $DIR/issue-70583-block-is-empty-2.rs:14:1
--> $DIR/issue-70583-block-is-empty-2.rs:16:1
|
LL | match self {
| - this delimiter might not be properly closed...
LL |
LL | ErrorHandled::Reported => {}}
| --- ...as it matches this but it has different indentation
| |

1
tests/ui/where-clauses/where-clause-bounds-inconsistency.rs
View File

@ -14,7 +14,6 @@ trait Trait {
impl Trait for bool {
fn a<T: Bound>(&self, _: T) {}
//^~ This gets rejected but should be accepted
fn b<T>(&self, _: T) where T: Bound {}
fn c<T: Bound>(&self, _: T) {}
fn d<T>(&self, _: T) where T: Bound {}