Skip to content

Commit

Permalink
Unrolled build for rust-lang#122343
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#122343 - compiler-errors:rando, r=fmease

Remove some unnecessary `allow(incomplete_features)` in the test suite

A useless change, but I like things to be clean.
  • Loading branch information
rust-timer authored Mar 12, 2024
2 parents 0fa7fea + f614eae commit 50e31cc
Show file tree
Hide file tree
Showing 62 changed files with 261 additions and 323 deletions.
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/early-bound-2.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ check-pass
//@ edition:2021

#![allow(incomplete_features)]

pub trait Foo {
#[allow(async_fn_in_trait)]
async fn foo(&mut self);
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/fn-not-async-err.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ edition: 2021

#![allow(incomplete_features)]

trait MyTrait {
async fn foo(&self) -> i32;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/async-await/in-trait/fn-not-async-err.stderr
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
error: method should be `async` or return a future, but it is synchronous
--> $DIR/fn-not-async-err.rs:10:5
--> $DIR/fn-not-async-err.rs:8:5
|
LL | fn foo(&self) -> i32 {
| ^^^^^^^^^^^^^^^^^^^^
|
note: this method is `async` so it expects a future to be returned
--> $DIR/fn-not-async-err.rs:6:5
--> $DIR/fn-not-async-err.rs:4:5
|
LL | async fn foo(&self) -> i32;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/fn-not-async-err2.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ edition: 2021
//@ check-pass

#![allow(incomplete_features)]

use std::future::Future;

trait MyTrait {
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/generics-mismatch.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ edition: 2021

#![allow(incomplete_features)]

trait Foo {
async fn foo<T>();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/async-await/in-trait/generics-mismatch.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0053]: method `foo` has an incompatible generic parameter for trait `Foo`
--> $DIR/generics-mismatch.rs:10:18
--> $DIR/generics-mismatch.rs:8:18
|
LL | trait Foo {
| ---
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/implied-bounds.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ check-pass
//@ edition: 2021

#![allow(incomplete_features)]

trait TcpStack {
type Connection<'a>: Sized where Self: 'a;
fn connect<'a>(&'a self) -> Self::Connection<'a>;
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/issue-102138.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ check-pass
//@ edition:2021

#![allow(incomplete_features)]

use std::future::Future;

async fn yield_now() {}
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/issue-102219.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
//@ edition:2021
//@ check-pass

#![allow(incomplete_features)]

trait T {
#[allow(async_fn_in_trait)]
async fn foo();
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/issue-102310.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ check-pass
//@ edition:2021

#![allow(incomplete_features)]

pub trait SpiDevice {
#[allow(async_fn_in_trait)]
async fn transaction<F, R>(&mut self);
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/issue-104678.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ edition:2021
//@ check-pass

#![allow(incomplete_features)]

use std::future::Future;
pub trait Pool {
type Conn;
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/async-await/in-trait/nested-rpit.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ edition: 2021
//@ check-pass

#![allow(incomplete_features)]

use std::future::Future;
use std::marker::PhantomData;

Expand Down
1 change: 0 additions & 1 deletion tests/ui/const-generics/auxiliary/generics_of_parent.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![feature(generic_const_exprs)]
#![allow(incomplete_features)]

// library portion of regression test for #87674
pub struct Foo<const N: usize>([(); N + 1])
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![feature(generic_const_exprs)]
#![allow(incomplete_features)]

// library portion of testing that `impl Trait<{ expr }>` doesnt
// ice because of a `DefKind::TyParam` parent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![feature(generic_const_exprs)]
#![allow(incomplete_features)]

pub struct Foo<const N: usize>;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![feature(generic_const_exprs)]
#![allow(incomplete_features)]

pub fn test1<T>() -> [u8; std::mem::size_of::<T>() - 1]
where
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LL | let _ = const_evaluatable_lib::test1::<T>();
|
= help: try adding a `where` bound using this expression: `where [(); std::mem::size_of::<T>() - 1]:`
note: required by a bound in `test1`
--> $DIR/auxiliary/const_evaluatable_lib.rs:6:10
--> $DIR/auxiliary/const_evaluatable_lib.rs:5:10
|
LL | pub fn test1<T>() -> [u8; std::mem::size_of::<T>() - 1]
| ----- required by a bound in this function
Expand All @@ -22,7 +22,7 @@ LL | let _ = const_evaluatable_lib::test1::<T>();
|
= help: try adding a `where` bound using this expression: `where [(); std::mem::size_of::<T>() - 1]:`
note: required by a bound in `test1`
--> $DIR/auxiliary/const_evaluatable_lib.rs:4:27
--> $DIR/auxiliary/const_evaluatable_lib.rs:3:27
|
LL | pub fn test1<T>() -> [u8; std::mem::size_of::<T>() - 1]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `test1`
Expand All @@ -35,7 +35,7 @@ LL | let _ = const_evaluatable_lib::test1::<T>();
|
= help: try adding a `where` bound using this expression: `where [(); std::mem::size_of::<T>() - 1]:`
note: required by a bound in `test1`
--> $DIR/auxiliary/const_evaluatable_lib.rs:6:10
--> $DIR/auxiliary/const_evaluatable_lib.rs:5:10
|
LL | pub fn test1<T>() -> [u8; std::mem::size_of::<T>() - 1]
| ----- required by a bound in this function
Expand All @@ -51,7 +51,7 @@ LL | let _ = const_evaluatable_lib::test1::<T>();
|
= help: try adding a `where` bound using this expression: `where [(); std::mem::size_of::<T>() - 1]:`
note: required by a bound in `test1`
--> $DIR/auxiliary/const_evaluatable_lib.rs:4:27
--> $DIR/auxiliary/const_evaluatable_lib.rs:3:27
|
LL | pub fn test1<T>() -> [u8; std::mem::size_of::<T>() - 1]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `test1`
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![feature(generic_const_exprs)]
#![allow(incomplete_features)]

// All of these three items must be in `lib2` to reproduce the error

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LL | generics_of_parent_impl_trait::foo([()]);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer the value of const parameter `N` declared on the function `foo`
|
note: required by a bound in `foo`
--> $DIR/auxiliary/generics_of_parent_impl_trait.rs:6:48
--> $DIR/auxiliary/generics_of_parent_impl_trait.rs:5:48
|
LL | pub fn foo<const N: usize>(foo: impl Into<[(); N + 1]>) {
| ^^^^^ required by this bound in `foo`
Expand Down
1 change: 0 additions & 1 deletion tests/ui/consts/auxiliary/closure-in-foreign-crate.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#![crate_type = "lib"]
#![feature(const_closures, const_trait_impl, effects)]
#![allow(incomplete_features)]

pub const fn test() {
let cl = const || {};
Expand Down
1 change: 0 additions & 1 deletion tests/ui/dyn-star/auxiliary/dyn-star-foreign.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![feature(dyn_star)]
#![allow(incomplete_features)]

use std::fmt::Display;

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/dyn-star/no-implicit-dyn-star.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ LL | dyn_star_foreign::require_dyn_star_display(1usize);
found type `usize`
= help: `usize` implements `Display`, `#[feature(dyn_star)]` is likely not enabled; that feature it is currently incomplete
note: function defined here
--> $DIR/auxiliary/dyn-star-foreign.rs:6:8
--> $DIR/auxiliary/dyn-star-foreign.rs:5:8
|
LL | pub fn require_dyn_star_display(_: dyn* Display) {}
| ^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/generic-associated-types/issue-90014-tait2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//@ error-pattern: expected generic lifetime parameter, found `'a`

#![feature(type_alias_impl_trait)]
#![allow(incomplete_features)]

use std::future::Future;

Expand Down
2 changes: 1 addition & 1 deletion tests/ui/generic-associated-types/issue-90014-tait2.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0792]: expected generic lifetime parameter, found `'a`
--> $DIR/issue-90014-tait2.rs:27:9
--> $DIR/issue-90014-tait2.rs:26:9
|
LL | type Fut<'a> = impl Future<Output = ()>;
| -- this generic parameter must be used with a generic lifetime parameter
Expand Down
1 change: 0 additions & 1 deletion tests/ui/impl-trait/in-trait/deep-match-works.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@ check-pass

#![feature(lint_reasons)]
#![allow(incomplete_features)]

pub struct Wrapper<T>(T);

Expand Down
2 changes: 0 additions & 2 deletions tests/ui/impl-trait/in-trait/default-body-type-err-2.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ edition:2021

#![allow(incomplete_features)]

pub trait Foo {
async fn woopsie_async(&self) -> String {
42
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0308]: mismatched types
--> $DIR/default-body-type-err-2.rs:7:9
--> $DIR/default-body-type-err-2.rs:5:9
|
LL | async fn woopsie_async(&self) -> String {
| ------ expected `String` because of return type
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/impl-trait/in-trait/default-body-with-rpit.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ edition:2021
//@ check-pass

#![allow(incomplete_features)]

use std::fmt::Debug;

trait Foo {
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/impl-trait/in-trait/default-body.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ check-pass
//@ edition:2021

#![allow(incomplete_features)]

use std::fmt::Debug;

trait Foo {
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/impl-trait/in-trait/early.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ check-pass
//@ edition:2021

#![allow(incomplete_features)]

pub trait Foo {
#[allow(async_fn_in_trait)]
async fn bar<'a: 'a>(&'a mut self);
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/impl-trait/in-trait/encode.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ build-pass
//@ compile-flags: --crate-type=lib

#![allow(incomplete_features)]

trait Foo {
fn bar() -> impl Sized;
}
2 changes: 0 additions & 2 deletions tests/ui/impl-trait/in-trait/issue-102301.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ check-pass

#![allow(incomplete_features)]

trait Foo<T> {
fn foo<F2: Foo<T>>(self) -> impl Foo<T>;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0053]: method `early` has an incompatible type for trait
--> $DIR/method-signature-matches.rs:57:27
--> $DIR/method-signature-matches.rs:55:27
|
LL | fn early<'late, T>(_: &'late ()) {}
| - ^^^^^^^^^
Expand All @@ -9,7 +9,7 @@ LL | fn early<'late, T>(_: &'late ()) {}
| expected this type parameter
|
note: type in trait
--> $DIR/method-signature-matches.rs:52:28
--> $DIR/method-signature-matches.rs:50:28
|
LL | fn early<'early, T>(x: &'early T) -> impl Sized;
| ^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0053]: method `owo` has an incompatible type for trait
--> $DIR/method-signature-matches.rs:13:15
--> $DIR/method-signature-matches.rs:11:15
|
LL | fn owo(_: u8) {}
| ^^
Expand All @@ -8,7 +8,7 @@ LL | fn owo(_: u8) {}
| help: change the parameter type to match the trait: `()`
|
note: type in trait
--> $DIR/method-signature-matches.rs:8:15
--> $DIR/method-signature-matches.rs:6:15
|
LL | fn owo(x: ()) -> impl Sized;
| ^^
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0053]: method `owo` has an incompatible type for trait
--> $DIR/method-signature-matches.rs:24:21
--> $DIR/method-signature-matches.rs:22:21
|
LL | async fn owo(_: u8) {}
| ^^
Expand All @@ -8,7 +8,7 @@ LL | async fn owo(_: u8) {}
| help: change the parameter type to match the trait: `()`
|
note: type in trait
--> $DIR/method-signature-matches.rs:19:21
--> $DIR/method-signature-matches.rs:17:21
|
LL | async fn owo(x: ()) {}
| ^^
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/impl-trait/in-trait/method-signature-matches.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ edition: 2021
//@ revisions: mismatch mismatch_async too_many too_few lt

#![allow(incomplete_features)]

#[cfg(mismatch)]
trait Uwu {
fn owo(x: ()) -> impl Sized;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0050]: method `come_on_a_little_more_effort` has 0 parameters but the declaration in trait `TooLittle::come_on_a_little_more_effort` has 3
--> $DIR/method-signature-matches.rs:46:5
--> $DIR/method-signature-matches.rs:44:5
|
LL | fn come_on_a_little_more_effort(_: (), _: (), _: ()) -> impl Sized;
| ---------------- trait requires 3 parameters
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0050]: method `calm_down_please` has 3 parameters but the declaration in trait `TooMuch::calm_down_please` has 0
--> $DIR/method-signature-matches.rs:35:28
--> $DIR/method-signature-matches.rs:33:28
|
LL | fn calm_down_please() -> impl Sized;
| ------------------------------------ trait requires 0 parameters
Expand Down
1 change: 0 additions & 1 deletion tests/ui/impl-trait/in-trait/nested-rpitit.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@ check-pass

#![feature(lint_reasons)]
#![allow(incomplete_features)]

use std::fmt::Display;
use std::ops::Deref;
Expand Down
2 changes: 0 additions & 2 deletions tests/ui/impl-trait/in-trait/opaque-in-impl.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ check-pass

#![allow(incomplete_features)]

use std::fmt::Debug;

trait Foo {
Expand Down
1 change: 0 additions & 1 deletion tests/ui/impl-trait/in-trait/reveal.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@ check-pass

#![feature(lint_reasons)]
#![allow(incomplete_features)]

pub trait Foo {
fn f() -> Box<impl Sized>;
Expand Down
1 change: 0 additions & 1 deletion tests/ui/impl-trait/in-trait/success.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@ check-pass

#![feature(lint_reasons)]
#![allow(incomplete_features)]

use std::fmt::Display;

Expand Down
2 changes: 0 additions & 2 deletions tests/ui/impl-trait/in-trait/wf-bounds.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// issue #101663

#![allow(incomplete_features)]

use std::fmt::Display;

trait Wf<T> {
Expand Down
Loading

0 comments on commit 50e31cc

Please sign in to comment.