Skip to content

Commit

Permalink
parse: Tweak the function parameter edition check
Browse files Browse the repository at this point in the history
Move anon-params tests to ui/anon-params.
  • Loading branch information
petrochenkov committed Mar 10, 2020
1 parent dd155df commit 6b27e8d
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 3 deletions.
4 changes: 1 addition & 3 deletions src/librustc_parse/parser/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1544,9 +1544,7 @@ impl<'a> Parser<'a> {

let is_name_required = match self.token.kind {
token::DotDotDot => false,
// FIXME: Consider using interpolated token for this edition check,
// it should match the intent of edition hygiene better.
_ => req_name(self.token.uninterpolate().span.edition()),
_ => req_name(self.token.span.edition()),
};
let (pat, ty) = if is_name_required || self.is_named_param() {
debug!("parse_param_general parse_pat (is_name_required:{})", is_name_required);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 10 additions & 0 deletions src/test/ui/anon-params/anon-params-edition-hygiene.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// check-pass
// edition:2018
// aux-build:anon-params-edition-hygiene.rs

#[macro_use]
extern crate anon_params_edition_hygiene;

generate_trait_2015!(u8);

fn main() {}
12 changes: 12 additions & 0 deletions src/test/ui/anon-params/auxiliary/anon-params-edition-hygiene.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// edition:2015

#[macro_export]
macro_rules! generate_trait_2015 {
($Type: ident) => {
trait Trait {
fn method($Type) {}
}
};
}

fn main() {}

0 comments on commit 6b27e8d

Please sign in to comment.