Auto merge of #45775 - petrochenkov:patnopat, r=nikomatsakis
Accept interpolated patterns in trait method parameters
Permit this, basically
```rust
macro_rules! m {
($pat: pat) => {
trait Tr {
fn f($pat: u8) {}
}
}
}
```
it previously caused a parsing error during expansion because trait methods accept only very restricted set of patterns during parsing due to ambiguities caused by [anonymous parameters](https://github.com/rust-lang/rust/issues/41686), and this set didn't include interpolated patterns.
Some outdated messages from "no patterns allowed" errors are also removed.
Addresses https://github.com/rust-lang/rust/issues/35203#issuecomment-341937159
This commit is contained in:
commit
b22679366a
6 changed files with 64 additions and 49 deletions
|
|
@ -14,7 +14,6 @@ trait Tr {
|
|||
fn f1(mut arg: u8); //~ ERROR patterns aren't allowed in methods without bodies
|
||||
//~^ WARN was previously accepted
|
||||
fn f2(&arg: u8); //~ ERROR patterns aren't allowed in methods without bodies
|
||||
//~^ WARN was previously accepted
|
||||
fn g1(arg: u8); // OK
|
||||
fn g2(_: u8); // OK
|
||||
#[allow(anonymous_parameters)]
|
||||
|
|
|
|||
36
src/test/compile-fail/no-patterns-in-args-macro.rs
Normal file
36
src/test/compile-fail/no-patterns-in-args-macro.rs
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
macro_rules! m {
|
||||
($pat: pat) => {
|
||||
trait Tr {
|
||||
fn trait_method($pat: u8);
|
||||
}
|
||||
|
||||
type A = fn($pat: u8);
|
||||
|
||||
extern {
|
||||
fn foreign_fn($pat: u8);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mod good_pat {
|
||||
m!(good_pat); // OK
|
||||
}
|
||||
|
||||
mod bad_pat {
|
||||
m!((bad, pat));
|
||||
//~^ ERROR patterns aren't allowed in function pointer types
|
||||
//~| ERROR patterns aren't allowed in foreign function declarations
|
||||
//~| ERROR patterns aren't allowed in methods without bodies
|
||||
}
|
||||
|
||||
fn main() {}
|
||||
|
|
@ -11,21 +11,17 @@
|
|||
extern {
|
||||
fn f1(mut arg: u8); //~ ERROR patterns aren't allowed in foreign function declarations
|
||||
//~^ NOTE pattern not allowed in foreign function
|
||||
//~| NOTE this is a recent error
|
||||
fn f2(&arg: u8); //~ ERROR patterns aren't allowed in foreign function declarations
|
||||
//~^ NOTE pattern not allowed in foreign function
|
||||
fn f3(arg @ _: u8); //~ ERROR patterns aren't allowed in foreign function declarations
|
||||
//~^ NOTE pattern not allowed in foreign function
|
||||
//~| NOTE this is a recent error
|
||||
fn g1(arg: u8); // OK
|
||||
fn g2(_: u8); // OK
|
||||
// fn g3(u8); // Not yet
|
||||
}
|
||||
|
||||
type A1 = fn(mut arg: u8); //~ ERROR patterns aren't allowed in function pointer types
|
||||
//~^ NOTE this is a recent error
|
||||
type A2 = fn(&arg: u8); //~ ERROR patterns aren't allowed in function pointer types
|
||||
//~^ NOTE this is a recent error
|
||||
type B1 = fn(arg: u8); // OK
|
||||
type B2 = fn(_: u8); // OK
|
||||
type B3 = fn(u8); // OK
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue