Skip to content

Commit

Permalink
Unrolled build for rust-lang#117973
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#117973 - CohenArthur:fix-89699, r=lqd

test: Add test for async-move in 2015 Rust proc macro

Fixes rust-lang#89699

Ran cargo bisect-rustc to find when this was fixed exactly, which is in 474709a
  • Loading branch information
rust-timer authored Nov 21, 2023
2 parents 8534923 + fd70a4c commit cebf357
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 0 deletions.
39 changes: 39 additions & 0 deletions tests/ui/proc-macro/auxiliary/edition-gated-async-move-syntax.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// force-host
// no-prefer-dynamic

// Proc macro helper for issue #89699, used by tests/ui/proc-macro/edition-gated-async-move-
// syntax-issue89699.rs, emitting an `async move` closure. This syntax is only available in
// editions 2018 and up, but is used in edition 2015 in the test.

#![crate_type = "proc-macro"]

extern crate proc_macro;
use proc_macro::*;

#[proc_macro_attribute]
pub fn foo(_attr: TokenStream, item: TokenStream) -> TokenStream {
let tt = item.into_iter().next().unwrap();
let sp = tt.span();
let mut arg = TokenStream::new();
let mut g = Group::new(Delimiter::Brace, TokenStream::new());
g.set_span(sp);
arg.extend([
TokenTree::Ident(Ident::new("async", sp)),
TokenTree::Ident(Ident::new("move", sp)),
TokenTree::Group(g),
]);
let mut body = TokenStream::new();
body.extend([
TokenTree::Ident(Ident::new("async_main", sp)),
TokenTree::Group(Group::new(Delimiter::Parenthesis, arg)),
]);

let mut ret = TokenStream::new();
ret.extend([
TokenTree::Ident(Ident::new("fn", sp)),
TokenTree::Ident(Ident::new("main", sp)),
TokenTree::Group(Group::new(Delimiter::Parenthesis, TokenStream::new())),
TokenTree::Group(Group::new(Delimiter::Brace, body)),
]);
ret
}
10 changes: 10 additions & 0 deletions tests/ui/proc-macro/edition-gated-async-move-syntax-issue89699.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// aux-build:edition-gated-async-move-syntax.rs
// edition: 2015

// Non-regression test for issue #89699, where a proc-macro emitting syntax only available in
// edition 2018 and up (`async move`) is used on edition 2015

extern crate edition_gated_async_move_syntax;

#[edition_gated_async_move_syntax::foo]
fn foo() {} //~ ERROR `async move` blocks are only allowed in Rust 2018 or later
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
error: `async move` blocks are only allowed in Rust 2018 or later
--> $DIR/edition-gated-async-move-syntax-issue89699.rs:10:1
|
LL | fn foo() {}
| ^^

error: aborting due to previous error

0 comments on commit cebf357

Please sign in to comment.