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

Gate async fn trait bound modifier on async_trait_bounds

Browse Source
This commit is contained in:
Michael Goulet 2024-11-04 19:29:02 +00:00
parent a6f2f00de8
commit 59e3e8934e
28 changed files with 86 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/rustc_ast_passes/src/feature_gate.rs
View File

@ -516,6 +516,11 @@ pub fn check_crate(krate: &ast::Crate, sess: &Session, features: &Features) {
"async closures are unstable",
"to use an async block, remove the `||`: `async {`"
);
gate_all!(
async_trait_bounds,
"`async` trait bounds are unstable",
"use the desugared name of the async trait, such as `AsyncFn`"
);
gate_all!(async_for_loop, "`for await` loops are experimental");
gate_all!(
closure_lifetime_binder,

2
compiler/rustc_feature/src/unstable.rs
View File

@ -394,6 +394,8 @@ declare_features! (
(unstable, async_fn_track_caller, "1.73.0", Some(110011)),
/// Allows `for await` loops.
(unstable, async_for_loop, "1.77.0", Some(118898)),
/// Allows `async` trait bound modifier.
(unstable, async_trait_bounds, "CURRENT_RUSTC_VERSION", Some(62290)),
/// Allows using C-variadics.
(unstable, c_variadic, "1.34.0", Some(44930)),
/// Allows the use of `#[cfg(<true/false>)]`.

4
compiler/rustc_parse/src/parser/ty.rs
View File

@ -940,7 +940,7 @@ impl<'a> Parser<'a> {
let asyncness = if self.token.uninterpolated_span().at_least_rust_2018()
&& self.eat_keyword(kw::Async)
{
self.psess.gated_spans.gate(sym::async_closure, self.prev_token.span);
self.psess.gated_spans.gate(sym::async_trait_bounds, self.prev_token.span);
BoundAsyncness::Async(self.prev_token.span)
} else if self.may_recover()
&& self.token.uninterpolated_span().is_rust_2015()
@ -951,7 +951,7 @@ impl<'a> Parser<'a> {
span: self.prev_token.span,
help: HelpUseLatestEdition::new(),
});
self.psess.gated_spans.gate(sym::async_closure, self.prev_token.span);
self.psess.gated_spans.gate(sym::async_trait_bounds, self.prev_token.span);
BoundAsyncness::Async(self.prev_token.span)
} else {
BoundAsyncness::Normal

1
compiler/rustc_span/src/symbol.rs
View File

@ -468,6 +468,7 @@ symbols! {
async_for_loop,
async_iterator,
async_iterator_poll_next,
async_trait_bounds,
atomic,
atomic_mod,
atomics,

2
src/tools/miri/tests/pass/async-closure-captures.rs
View File

@ -1,6 +1,6 @@
// Same as rustc's `tests/ui/async-await/async-closures/captures.rs`, keep in sync
#![feature(async_closure, noop_waker)]
#![feature(async_closure, noop_waker, async_trait_bounds)]
use std::future::Future;
use std::pin::pin;

2
src/tools/miri/tests/pass/async-closure-drop.rs
View File

@ -1,4 +1,4 @@
#![feature(async_closure, noop_waker, async_fn_traits)]
#![feature(async_closure, noop_waker, async_trait_bounds)]
use std::future::Future;
use std::pin::pin;

2
tests/codegen/async-closure-debug.rs
View File

@ -9,7 +9,7 @@
#![feature(async_closure)]
fn async_closure_test(upvar: &str) -> impl async Fn() + '_ {
fn async_closure_test(upvar: &str) -> impl AsyncFn() + '_ {
async move || {
let hello = String::from("hello");
println!("{hello}, {upvar}");

8
tests/coverage/async_closure.cov-map
View File

@ -1,19 +1,19 @@
Function name: async_closure::call_once::<async_closure::main::{closure#0}>
Raw bytes (9): 0x[01, 01, 00, 01, 01, 07, 01, 00, 2c]
Raw bytes (9): 0x[01, 01, 00, 01, 01, 07, 01, 00, 2b]
Number of files: 1
- file 0 => global file 1
Number of expressions: 0
Number of file 0 mappings: 1
- Code(Counter(0)) at (prev + 7, 1) to (start + 0, 44)
- Code(Counter(0)) at (prev + 7, 1) to (start + 0, 43)
Highest counter ID seen: c0
Function name: async_closure::call_once::<async_closure::main::{closure#0}>::{closure#0}
Raw bytes (14): 0x[01, 01, 00, 02, 01, 07, 2c, 01, 0e, 05, 02, 01, 00, 02]
Raw bytes (14): 0x[01, 01, 00, 02, 01, 07, 2b, 01, 0e, 05, 02, 01, 00, 02]
Number of files: 1
- file 0 => global file 1
Number of expressions: 0
Number of file 0 mappings: 2
- Code(Counter(0)) at (prev + 7, 44) to (start + 1, 14)
- Code(Counter(0)) at (prev + 7, 43) to (start + 1, 14)
- Code(Counter(1)) at (prev + 2, 1) to (start + 0, 2)
Highest counter ID seen: c1

2
tests/coverage/async_closure.coverage
View File

@ -4,7 +4,7 @@
LL| |//@ aux-build: executor.rs
LL| |extern crate executor;
LL| |
LL| 1|async fn call_once(f: impl async FnOnce()) {
LL| 1|async fn call_once(f: impl AsyncFnOnce()) {
LL| 1| f().await;
LL| 1|}
LL| |

2
tests/coverage/async_closure.rs
View File

@ -4,7 +4,7 @@
//@ aux-build: executor.rs
extern crate executor;
async fn call_once(f: impl async FnOnce()) {
async fn call_once(f: impl AsyncFnOnce()) {
f().await;
}

4
tests/crashes/124020.rs
View File

@ -1,7 +1,7 @@
//@ known-bug: #124020
//@ compile-flags: -Zpolymorphize=on --edition=2018 --crate-type=lib
#![feature(async_closure, noop_waker, async_fn_traits)]
#![feature(async_closure, noop_waker, async_trait_bounds)]
use std::future::Future;
use std::pin::pin;
@ -19,7 +19,7 @@ pub fn block_on<T>(fut: impl Future<Output = T>) -> T {
}
}
async fn call_once(f: impl async FnOnce(DropMe)) {
async fn call_once(f: impl AsyncFnOnce(DropMe)) {
f(DropMe("world")).await;
}

2
tests/ui/async-await/async-fn/dyn-pos.rs
View File

@ -2,7 +2,7 @@
#![feature(async_closure)]
fn foo(x: &dyn async Fn()) {}
fn foo(x: &dyn AsyncFn()) {}
//~^ ERROR the trait `AsyncFnMut` cannot be made into an object
fn main() {}

4
tests/ui/async-await/async-fn/dyn-pos.stderr
View File

@ -1,8 +1,8 @@
error[E0038]: the trait `AsyncFnMut` cannot be made into an object
--> $DIR/dyn-pos.rs:5:16
|
LL | fn foo(x: &dyn async Fn()) {}
| ^^^^^^^^^^ `AsyncFnMut` cannot be made into an object
LL | fn foo(x: &dyn AsyncFn()) {}
| ^^^^^^^^^ `AsyncFnMut` cannot be made into an object
|
note: for a trait to be "dyn-compatible" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
--> $SRC_DIR/core/src/ops/async_function.rs:LL:COL

4
tests/ui/async-await/async-fn/edition-2015.rs
View File

@ -1,8 +1,8 @@
fn foo(x: impl async Fn()) -> impl async Fn() { x }
//~^ ERROR `async` trait bounds are only allowed in Rust 2018 or later
//~| ERROR `async` trait bounds are only allowed in Rust 2018 or later
//~| ERROR async closures are unstable
//~| ERROR async closures are unstable
//~| ERROR `async` trait bounds are unstable
//~| ERROR `async` trait bounds are unstable
//~| ERROR use of unstable library feature `async_closure`
//~| ERROR use of unstable library feature `async_closure`

12
tests/ui/async-await/async-fn/edition-2015.stderr
View File

@ -16,27 +16,27 @@ LL | fn foo(x: impl async Fn()) -> impl async Fn() { x }
= help: pass `--edition 2024` to `rustc`
= note: for more on editions, read https://doc.rust-lang.org/edition-guide
error[E0658]: async closures are unstable
error[E0658]: `async` trait bounds are unstable
--> $DIR/edition-2015.rs:1:16
|
LL | fn foo(x: impl async Fn()) -> impl async Fn() { x }
| ^^^^^
|
= note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
= help: add `#![feature(async_closure)]` to the crate attributes to enable
= help: add `#![feature(async_trait_bounds)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: to use an async block, remove the `||`: `async {`
= help: use the desugared name of the async trait, such as `AsyncFn`
error[E0658]: async closures are unstable
error[E0658]: `async` trait bounds are unstable
--> $DIR/edition-2015.rs:1:36
|
LL | fn foo(x: impl async Fn()) -> impl async Fn() { x }
| ^^^^^
|
= note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
= help: add `#![feature(async_closure)]` to the crate attributes to enable
= help: add `#![feature(async_trait_bounds)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: to use an async block, remove the `||`: `async {`
= help: use the desugared name of the async trait, such as `AsyncFn`
error[E0658]: use of unstable library feature `async_closure`
--> $DIR/edition-2015.rs:1:42

4
tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.rs
View File

@ -13,9 +13,9 @@ macro_rules! demo {
}
demo! { impl async Trait }
//~^ ERROR async closures are unstable
//~^ ERROR `async` trait bounds are unstable
demo! { dyn async Trait }
//~^ ERROR async closures are unstable
//~^ ERROR `async` trait bounds are unstable
fn main() {}

12
tests/ui/async-await/async-fn/mbe-async-trait-bound-theoretical-regression.stderr
View File

@ -20,27 +20,27 @@ LL | demo! { dyn async Trait }
|
= note: this error originates in the macro `demo` (in Nightly builds, run with -Z macro-backtrace for more info)
error[E0658]: async closures are unstable
error[E0658]: `async` trait bounds are unstable
--> $DIR/mbe-async-trait-bound-theoretical-regression.rs:15:14
|
LL | demo! { impl async Trait }
| ^^^^^
|
= note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
= help: add `#![feature(async_closure)]` to the crate attributes to enable
= help: add `#![feature(async_trait_bounds)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: to use an async block, remove the `||`: `async {`
= help: use the desugared name of the async trait, such as `AsyncFn`
error[E0658]: async closures are unstable
error[E0658]: `async` trait bounds are unstable
--> $DIR/mbe-async-trait-bound-theoretical-regression.rs:18:13
|
LL | demo! { dyn async Trait }
| ^^^^^
|
= note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
= help: add `#![feature(async_closure)]` to the crate attributes to enable
= help: add `#![feature(async_trait_bounds)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: to use an async block, remove the `||`: `async {`
= help: use the desugared name of the async trait, such as `AsyncFn`
error: aborting due to 4 previous errors

2
tests/ui/async-await/async-fn/not-a-trait.rs
View File

@ -1,6 +1,6 @@
//@ edition:2018
#![feature(async_closure)]
#![feature(async_trait_bounds)]
struct S;

2
tests/ui/async-await/async-fn/sugar.rs
View File

@ -1,7 +1,7 @@
//@ edition: 2021
//@ check-pass
#![feature(async_closure)]
#![feature(async_closure, async_trait_bounds)]
async fn foo() {}

2
tests/ui/async-await/async-fn/trait-bounds-in-macro.rs
View File

@ -6,7 +6,7 @@ macro_rules! x {
x! {
async fn foo() -> impl async Fn() { }
//~^ ERROR async closures are unstable
//~^ ERROR `async` trait bounds are unstable
}
fn main() {}

6
tests/ui/async-await/async-fn/trait-bounds-in-macro.stderr
View File

@ -1,13 +1,13 @@
error[E0658]: async closures are unstable
error[E0658]: `async` trait bounds are unstable
--> $DIR/trait-bounds-in-macro.rs:8:28
|
LL | async fn foo() -> impl async Fn() { }
| ^^^^^
|
= note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
= help: add `#![feature(async_closure)]` to the crate attributes to enable
= help: add `#![feature(async_trait_bounds)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: to use an async block, remove the `||`: `async {`
= help: use the desugared name of the async trait, such as `AsyncFn`
error: aborting due to 1 previous error

2
tests/ui/async-await/async-fn/wrong-trait.rs
View File

@ -1,6 +1,6 @@
//@ edition:2018
#![feature(async_closure)]
#![feature(async_trait_bounds)]
trait Foo {}

7
tests/ui/feature-gates/feature-gate-async-trait-bounds.rs Normal file
View File

@ -0,0 +1,7 @@
//@ edition: 2021
fn test(_: impl async Fn()) {}
//~^ ERROR `async` trait bounds are unstable
//~| ERROR use of unstable library feature `async_closure`
fn main() {}

24
tests/ui/feature-gates/feature-gate-async-trait-bounds.stderr Normal file
View File

@ -0,0 +1,24 @@
error[E0658]: `async` trait bounds are unstable
--> $DIR/feature-gate-async-trait-bounds.rs:3:17
|
LL | fn test(_: impl async Fn()) {}
| ^^^^^
|
= note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
= help: add `#![feature(async_trait_bounds)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: use the desugared name of the async trait, such as `AsyncFn`
error[E0658]: use of unstable library feature `async_closure`
--> $DIR/feature-gate-async-trait-bounds.rs:3:23
|
LL | fn test(_: impl async Fn()) {}
| ^^^^
|
= note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
= help: add `#![feature(async_closure)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
error: aborting due to 2 previous errors
For more information about this error, try `rustc --explain E0658`.

2
tests/ui/impl-trait/precise-capturing/bound-modifiers.rs
View File

@ -7,7 +7,7 @@ fn polarity() -> impl Sized + ?use<> {}
fn asyncness() -> impl Sized + async use<> {}
//~^ ERROR expected identifier, found keyword `use`
//~| ERROR cannot find trait `r#use` in this scope
//~| ERROR async closures are unstable
//~| ERROR `async` trait bounds are unstable
fn constness() -> impl Sized + const use<> {}
//~^ ERROR expected identifier, found keyword `use`

6
tests/ui/impl-trait/precise-capturing/bound-modifiers.stderr
View File

@ -46,16 +46,16 @@ error[E0405]: cannot find trait `r#use` in this scope
LL | fn binder() -> impl Sized + for<'a> use<> {}
| ^^^ not found in this scope
error[E0658]: async closures are unstable
error[E0658]: `async` trait bounds are unstable
--> $DIR/bound-modifiers.rs:7:32
|
LL | fn asyncness() -> impl Sized + async use<> {}
| ^^^^^
|
= note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
= help: add `#![feature(async_closure)]` to the crate attributes to enable
= help: add `#![feature(async_trait_bounds)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: to use an async block, remove the `||`: `async {`
= help: use the desugared name of the async trait, such as `AsyncFn`
error[E0658]: const trait impls are experimental
--> $DIR/bound-modifiers.rs:12:32

2
tests/ui/parser/bad-recover-kw-after-impl.rs
View File

@ -12,6 +12,6 @@ macro_rules! impl_primitive {
impl_primitive!(impl async);
//~^ ERROR expected identifier, found `<eof>`
//~| ERROR async closures are unstable
//~| ERROR `async` trait bounds are unstable
fn main() {}

6
tests/ui/parser/bad-recover-kw-after-impl.stderr
View File

@ -7,16 +7,16 @@ LL | ($ty:ty) => {
LL | impl_primitive!(impl async);
| ^^^^^ expected identifier
error[E0658]: async closures are unstable
error[E0658]: `async` trait bounds are unstable
--> $DIR/bad-recover-kw-after-impl.rs:13:22
|
LL | impl_primitive!(impl async);
| ^^^^^
|
= note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
= help: add `#![feature(async_closure)]` to the crate attributes to enable
= help: add `#![feature(async_trait_bounds)]` to the crate attributes to enable
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
= help: to use an async block, remove the `||`: `async {`
= help: use the desugared name of the async trait, such as `AsyncFn`
error: aborting due to 2 previous errors