OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #63693 - Centril:polish-parse-or-pats, r=estebank

Browse Source 
Fully implement or-pattern parsing

Builds upon the initial parsing in https://github.com/rust-lang/rust/pull/61708 to fully implement or-pattern (`p | q`) parsing as specified in [the grammar section of RFC 2535](https://github.com/rust-lang/rfcs/blob/master/text/2535-or-patterns.md#grammar).

Noteworthy:

- We allow or-patterns in `[p | q, ...]`.
- We allow or-patterns in `let` statements and `for` expressions including with leading `|`.
- We improve recovery for `p || q` (+ tests for that in `multiple-pattern-typo.rs`).
- We improve recovery for `| p | q` in inner patterns (tests in `or-patterns-syntactic-fail.rs`).
- We rigorously test or-pattern parsing (in `or-patterns-syntactic-{pass,fail}.rs`).
- We harden the feature gating tests.
- We do **_not_** change `ast.rs`. That is, `ExprKind::Let.0` and `Arm.pats` still accept `Vec<P<Pat>>`.
   I was starting work on that but it would be cleaner to do this in a separate PR so this one has a narrower scope.

cc @dlrobertson
cc the tracking issue https://github.com/rust-lang/rust/issues/54883.

r? @estebank
This commit is contained in:
Mazdak Farrokhzad 2019-08-26 23:55:44 +02:00 committed by GitHub
commit 7dc3c934e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
67 changed files with 1084 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsyntax/parse/parser.rs
View File

@ -971,15 +971,12 @@ impl<'a> Parser<'a> {
/// Skips unexpected attributes and doc comments in this position and emits an appropriate
/// error.
/// This version of parse arg doesn't necessarily require identifier names.
fn parse_arg_general<F>(
fn parse_arg_general(
&mut self,
is_trait_item: bool,
allow_c_variadic: bool,
is_name_required: F,
) -> PResult<'a, Arg>
where
F: Fn(&token::Token) -> bool
{
is_name_required: impl Fn(&token::Token) -> bool,
) -> PResult<'a, Arg> {
let lo = self.token.span;
let attrs = self.parse_arg_attributes()?;
if let Some(mut arg) = self.parse_self_arg()? {
@ -991,7 +988,7 @@ impl<'a> Parser<'a> {
let (pat, ty) = if is_name_required || self.is_named_argument() {
debug!("parse_arg_general parse_pat (is_name_required:{})", is_name_required);
let pat = self.parse_pat(Some("argument name"))?;
let pat = self.parse_fn_param_pat()?;
if let Err(mut err) = self.expect(&token::Colon) {
if let Some(ident) = self.argument_without_type(
&mut err,

17
src/libsyntax/parse/parser/expr.rs
View File

@ -1,6 +1,7 @@
use super::{Parser, PResult, Restrictions, PrevTokenKind, TokenType, PathStyle};
use super::{BlockMode, SemiColonMode};
use super::{SeqSep, TokenExpectType};
use super::pat::{GateOr, PARAM_EXPECTED};
use crate::maybe_recover_from_interpolated_ty_qpath;
use crate::ptr::P;
@ -1175,7 +1176,7 @@ impl<'a> Parser<'a> {
fn parse_fn_block_arg(&mut self) -> PResult<'a, Arg> {
let lo = self.token.span;
let attrs = self.parse_arg_attributes()?;
let pat = self.parse_pat(Some("argument name"))?;
let pat = self.parse_pat(PARAM_EXPECTED)?;
let t = if self.eat(&token::Colon) {
self.parse_ty()?
} else {
@ -1241,11 +1242,12 @@ impl<'a> Parser<'a> {
Ok(cond)
}
/// Parses a `let $pats = $expr` pseudo-expression.
/// Parses a `let $pat = $expr` pseudo-expression.
/// The `let` token has already been eaten.
fn parse_let_expr(&mut self, attrs: ThinVec<Attribute>) -> PResult<'a, P<Expr>> {
let lo = self.prev_span;
let pats = self.parse_pats()?;
// FIXME(or_patterns, Centril | dlrobertson): use `parse_top_pat` instead.
let pat = self.parse_top_pat_unpack(GateOr::No)?;
self.expect(&token::Eq)?;
let expr = self.with_res(
Restrictions::NO_STRUCT_LITERAL,
@ -1253,7 +1255,7 @@ impl<'a> Parser<'a> {
)?;
let span = lo.to(expr.span);
self.sess.gated_spans.let_chains.borrow_mut().push(span);
Ok(self.mk_expr(span, ExprKind::Let(pats, expr), attrs))
Ok(self.mk_expr(span, ExprKind::Let(pat, expr), attrs))
}
/// `else` token already eaten
@ -1283,7 +1285,7 @@ impl<'a> Parser<'a> {
_ => None,
};
let pat = self.parse_top_level_pat()?;
let pat = self.parse_top_pat(GateOr::Yes)?;
if !self.eat_keyword(kw::In) {
let in_span = self.prev_span.between(self.token.span);
self.struct_span_err(in_span, "missing `in` in `for` loop")
@ -1387,7 +1389,8 @@ impl<'a> Parser<'a> {
crate fn parse_arm(&mut self) -> PResult<'a, Arm> {
let attrs = self.parse_outer_attributes()?;
let lo = self.token.span;
let pats = self.parse_pats()?;
// FIXME(or_patterns, Centril | dlrobertson): use `parse_top_pat` instead.
let pat = self.parse_top_pat_unpack(GateOr::No)?;
let guard = if self.eat_keyword(kw::If) {
Some(self.parse_expr()?)
} else {
@ -1448,7 +1451,7 @@ impl<'a> Parser<'a> {
Ok(ast::Arm {
attrs,
pats,
pats: pat, // FIXME(or_patterns, Centril | dlrobertson): this should just be `pat,`.
guard,
body: expr,
span: lo.to(hi),

294
src/libsyntax/parse/parser/pat.rs
View File

@ -12,82 +12,186 @@ use crate::ThinVec;
use errors::{Applicability, DiagnosticBuilder};
type Expected = Option<&'static str>;
/// `Expected` for function and lambda parameter patterns.
pub(super) const PARAM_EXPECTED: Expected = Some("parameter name");
/// Whether or not an or-pattern should be gated when occurring in the current context.
#[derive(PartialEq)]
pub enum GateOr { Yes, No }
/// Whether or not to recover a `,` when parsing or-patterns.
#[derive(PartialEq, Copy, Clone)]
enum RecoverComma { Yes, No }
impl<'a> Parser<'a> {
/// Parses a pattern.
pub fn parse_pat(
&mut self,
expected: Option<&'static str>
) -> PResult<'a, P<Pat>> {
///
/// Corresponds to `pat<no_top_alt>` in RFC 2535 and does not admit or-patterns
/// at the top level. Used when parsing the parameters of lambda expressions,
/// functions, function pointers, and `pat` macro fragments.
pub fn parse_pat(&mut self, expected: Expected) -> PResult<'a, P<Pat>> {
self.parse_pat_with_range_pat(true, expected)
}
/// Parses patterns, separated by '|' s.
pub(super) fn parse_pats(&mut self) -> PResult<'a, Vec<P<Pat>>> {
// Allow a '|' before the pats (RFC 1925 + RFC 2530)
self.eat(&token::BinOp(token::Or));
let mut pats = Vec::new();
loop {
pats.push(self.parse_top_level_pat()?);
if self.token == token::OrOr {
self.struct_span_err(self.token.span, "unexpected token `||` after pattern")
.span_suggestion(
self.token.span,
"use a single `|` to specify multiple patterns",
"|".to_owned(),
Applicability::MachineApplicable
)
.emit();
self.bump();
} else if self.eat(&token::BinOp(token::Or)) {
// This is a No-op. Continue the loop to parse the next
// pattern.
} else {
return Ok(pats);
}
};
// FIXME(or_patterns, Centril | dlrobertson):
// remove this and use `parse_top_pat` everywhere it is used instead.
pub(super) fn parse_top_pat_unpack(&mut self, gate_or: GateOr) -> PResult<'a, Vec<P<Pat>>> {
self.parse_top_pat(gate_or)
.map(|pat| pat.and_then(|pat| match pat.node {
PatKind::Or(pats) => pats,
node => vec![self.mk_pat(pat.span, node)],
}))
}
/// A wrapper around `parse_pat` with some special error handling for the
/// "top-level" patterns in a match arm, `for` loop, `let`, &c. (in contrast
/// to subpatterns within such).
pub(super) fn parse_top_level_pat(&mut self) -> PResult<'a, P<Pat>> {
let pat = self.parse_pat(None)?;
if self.token == token::Comma {
// An unexpected comma after a top-level pattern is a clue that the
// user (perhaps more accustomed to some other language) forgot the
// parentheses in what should have been a tuple pattern; return a
// suggestion-enhanced error here rather than choking on the comma
// later.
let comma_span = self.token.span;
self.bump();
if let Err(mut err) = self.skip_pat_list() {
// We didn't expect this to work anyway; we just wanted
// to advance to the end of the comma-sequence so we know
// the span to suggest parenthesizing
err.cancel();
/// Entry point to the main pattern parser.
/// Corresponds to `top_pat` in RFC 2535 and allows or-pattern at the top level.
pub(super) fn parse_top_pat(&mut self, gate_or: GateOr) -> PResult<'a, P<Pat>> {
// Allow a '|' before the pats (RFCs 1925, 2530, and 2535).
let gated_leading_vert = self.eat_or_separator() && gate_or == GateOr::Yes;
let leading_vert_span = self.prev_span;
// Parse the possibly-or-pattern.
let pat = self.parse_pat_with_or(None, gate_or, RecoverComma::Yes)?;
// If we parsed a leading `|` which should be gated,
// and no other gated or-pattern has been parsed thus far,
// then we should really gate the leading `|`.
// This complicated procedure is done purely for diagnostics UX.
if gated_leading_vert {
let mut or_pattern_spans = self.sess.gated_spans.or_patterns.borrow_mut();
if or_pattern_spans.is_empty() {
or_pattern_spans.push(leading_vert_span);
}
let seq_span = pat.span.to(self.prev_span);
let mut err = self.struct_span_err(comma_span, "unexpected `,` in pattern");
if let Ok(seq_snippet) = self.span_to_snippet(seq_span) {
err.span_suggestion(
seq_span,
"try adding parentheses to match on a tuple..",
format!("({})", seq_snippet),
Applicability::MachineApplicable
).span_suggestion(
seq_span,
"..or a vertical bar to match on multiple alternatives",
format!("{}", seq_snippet.replace(",", " |")),
Applicability::MachineApplicable
);
}
return Err(err);
}
Ok(pat)
}
/// Parse the pattern for a function or function pointer parameter.
/// Special recovery is provided for or-patterns and leading `|`.
pub(super) fn parse_fn_param_pat(&mut self) -> PResult<'a, P<Pat>> {
self.recover_leading_vert("not allowed in a parameter pattern");
let pat = self.parse_pat_with_or(PARAM_EXPECTED, GateOr::No, RecoverComma::No)?;
if let PatKind::Or(..) = &pat.node {
self.ban_illegal_fn_param_or_pat(&pat);
}
Ok(pat)
}
/// Ban `A | B` immediately in a parameter pattern and suggest wrapping in parens.
fn ban_illegal_fn_param_or_pat(&self, pat: &Pat) {
let msg = "wrap the pattern in parenthesis";
let fix = format!("({})", pprust::pat_to_string(pat));
self.struct_span_err(pat.span, "an or-pattern parameter must be wrapped in parenthesis")
.span_suggestion(pat.span, msg, fix, Applicability::MachineApplicable)
.emit();
}
/// Parses a pattern, that may be a or-pattern (e.g. `Foo | Bar` in `Some(Foo | Bar)`).
/// Corresponds to `pat<allow_top_alt>` in RFC 2535.
fn parse_pat_with_or(
&mut self,
expected: Expected,
gate_or: GateOr,
rc: RecoverComma,
) -> PResult<'a, P<Pat>> {
// Parse the first pattern.
let first_pat = self.parse_pat(expected)?;
self.maybe_recover_unexpected_comma(first_pat.span, rc)?;
// If the next token is not a `|`,
// this is not an or-pattern and we should exit here.
if !self.check(&token::BinOp(token::Or)) && self.token != token::OrOr {
return Ok(first_pat)
}
let lo = first_pat.span;
let mut pats = vec![first_pat];
while self.eat_or_separator() {
let pat = self.parse_pat(expected).map_err(|mut err| {
err.span_label(lo, "while parsing this or-pattern staring here");
err
})?;
self.maybe_recover_unexpected_comma(pat.span, rc)?;
pats.push(pat);
}
let or_pattern_span = lo.to(self.prev_span);
// Feature gate the or-pattern if instructed:
if gate_or == GateOr::Yes {
self.sess.gated_spans.or_patterns.borrow_mut().push(or_pattern_span);
}
Ok(self.mk_pat(or_pattern_span, PatKind::Or(pats)))
}
/// Eat the or-pattern `|` separator.
/// If instead a `||` token is encountered, recover and pretend we parsed `|`.
fn eat_or_separator(&mut self) -> bool {
match self.token.kind {
token::OrOr => {
// Found `||`; Recover and pretend we parsed `|`.
self.ban_unexpected_or_or();
self.bump();
true
}
_ => self.eat(&token::BinOp(token::Or)),
}
}
/// We have parsed `||` instead of `|`. Error and suggest `|` instead.
fn ban_unexpected_or_or(&mut self) {
self.struct_span_err(self.token.span, "unexpected token `||` after pattern")
.span_suggestion(
self.token.span,
"use a single `|` to separate multiple alternative patterns",
"|".to_owned(),
Applicability::MachineApplicable
)
.emit();
}
/// Some special error handling for the "top-level" patterns in a match arm,
/// `for` loop, `let`, &c. (in contrast to subpatterns within such).
fn maybe_recover_unexpected_comma(&mut self, lo: Span, rc: RecoverComma) -> PResult<'a, ()> {
if rc == RecoverComma::No || self.token != token::Comma {
return Ok(());
}
// An unexpected comma after a top-level pattern is a clue that the
// user (perhaps more accustomed to some other language) forgot the
// parentheses in what should have been a tuple pattern; return a
// suggestion-enhanced error here rather than choking on the comma later.
let comma_span = self.token.span;
self.bump();
if let Err(mut err) = self.skip_pat_list() {
// We didn't expect this to work anyway; we just wanted to advance to the
// end of the comma-sequence so we know the span to suggest parenthesizing.
err.cancel();
}
let seq_span = lo.to(self.prev_span);
let mut err = self.struct_span_err(comma_span, "unexpected `,` in pattern");
if let Ok(seq_snippet) = self.span_to_snippet(seq_span) {
err.span_suggestion(
seq_span,
"try adding parentheses to match on a tuple..",
format!("({})", seq_snippet),
Applicability::MachineApplicable
)
.span_suggestion(
seq_span,
"..or a vertical bar to match on multiple alternatives",
format!("{}", seq_snippet.replace(",", " |")),
Applicability::MachineApplicable
);
}
Err(err)
}
/// Parse and throw away a parentesized comma separated
/// sequence of patterns until `)` is reached.
fn skip_pat_list(&mut self) -> PResult<'a, ()> {
@ -100,32 +204,26 @@ impl<'a> Parser<'a> {
Ok(())
}
/// Parses a pattern, that may be a or-pattern (e.g. `Some(Foo | Bar)`).
fn parse_pat_with_or(&mut self, expected: Option<&'static str>) -> PResult<'a, P<Pat>> {
// Parse the first pattern.
let first_pat = self.parse_pat(expected)?;
/// Recursive possibly-or-pattern parser with recovery for an erroneous leading `|`.
/// See `parse_pat_with_or` for details on parsing or-patterns.
fn parse_pat_with_or_inner(&mut self) -> PResult<'a, P<Pat>> {
self.recover_leading_vert("only allowed in a top-level pattern");
self.parse_pat_with_or(None, GateOr::Yes, RecoverComma::No)
}
// If the next token is not a `|`, this is not an or-pattern and
// we should exit here.
if !self.check(&token::BinOp(token::Or)) {
return Ok(first_pat)
/// Recover if `|` or `||` is here.
/// The user is thinking that a leading `|` is allowed in this position.
fn recover_leading_vert(&mut self, ctx: &str) {
if let token::BinOp(token::Or) | token::OrOr = self.token.kind {
let span = self.token.span;
let rm_msg = format!("remove the `{}`", pprust::token_to_string(&self.token));
self.struct_span_err(span, &format!("a leading `|` is {}", ctx))
.span_suggestion(span, &rm_msg, String::new(), Applicability::MachineApplicable)
.emit();
self.bump();
}
let lo = first_pat.span;
let mut pats = vec![first_pat];
while self.eat(&token::BinOp(token::Or)) {
pats.push(self.parse_pat_with_range_pat(
true, expected
)?);
}
let or_pattern_span = lo.to(self.prev_span);
self.sess.gated_spans.or_patterns.borrow_mut().push(or_pattern_span);
Ok(self.mk_pat(or_pattern_span, PatKind::Or(pats)))
}
/// Parses a pattern, with a setting whether modern range patterns (e.g., `a..=b`, `a..b` are
@ -133,7 +231,7 @@ impl<'a> Parser<'a> {
fn parse_pat_with_range_pat(
&mut self,
allow_range_pat: bool,
expected: Option<&'static str>,
expected: Expected,
) -> PResult<'a, P<Pat>> {
maybe_recover_from_interpolated_ty_qpath!(self, true);
maybe_whole!(self, NtPat, |x| x);
@ -144,7 +242,11 @@ impl<'a> Parser<'a> {
token::OpenDelim(token::Paren) => self.parse_pat_tuple_or_parens()?,
token::OpenDelim(token::Bracket) => {
// Parse `[pat, pat,...]` as a slice pattern.
PatKind::Slice(self.parse_delim_comma_seq(token::Bracket, |p| p.parse_pat(None))?.0)
let (pats, _) = self.parse_delim_comma_seq(
token::Bracket,
|p| p.parse_pat_with_or_inner(),
)?;
PatKind::Slice(pats)
}
token::DotDot => {
self.bump();
@ -255,7 +357,7 @@ impl<'a> Parser<'a> {
}
/// Parse `&pat` / `&mut pat`.
fn parse_pat_deref(&mut self, expected: Option<&'static str>) -> PResult<'a, PatKind> {
fn parse_pat_deref(&mut self, expected: Expected) -> PResult<'a, PatKind> {
self.expect_and()?;
let mutbl = self.parse_mutability();
@ -271,9 +373,7 @@ impl<'a> Parser<'a> {
/// Parse a tuple or parenthesis pattern.
fn parse_pat_tuple_or_parens(&mut self) -> PResult<'a, PatKind> {
let (fields, trailing_comma) = self.parse_paren_comma_seq(|p| {
p.parse_pat_with_or(None)
})?;
let (fields, trailing_comma) = self.parse_paren_comma_seq(|p| p.parse_pat_with_or_inner())?;
// Here, `(pat,)` is a tuple pattern.
// For backward compatibility, `(..)` is a tuple pattern as well.
@ -361,7 +461,7 @@ impl<'a> Parser<'a> {
fn fatal_unexpected_non_pat(
&mut self,
mut err: DiagnosticBuilder<'a>,
expected: Option<&'static str>,
expected: Expected,
) -> PResult<'a, P<Pat>> {
self.cancel(&mut err);
@ -516,7 +616,7 @@ impl<'a> Parser<'a> {
err.span_label(self.token.span, msg);
return Err(err);
}
let (fields, _) = self.parse_paren_comma_seq(|p| p.parse_pat_with_or(None))?;
let (fields, _) = self.parse_paren_comma_seq(|p| p.parse_pat_with_or_inner())?;
Ok(PatKind::TupleStruct(path, fields))
}
@ -660,7 +760,7 @@ impl<'a> Parser<'a> {
// Parsing a pattern of the form "fieldname: pat"
let fieldname = self.parse_field_name()?;
self.bump();
let pat = self.parse_pat_with_or(None)?;
let pat = self.parse_pat_with_or_inner()?;
hi = pat.span;
(pat, fieldname, false)
} else {

3
src/libsyntax/parse/parser/stmt.rs
View File

@ -1,6 +1,7 @@
use super::{Parser, PResult, Restrictions, PrevTokenKind, SemiColonMode, BlockMode};
use super::expr::LhsExpr;
use super::path::PathStyle;
use super::pat::GateOr;
use crate::ptr::P;
use crate::{maybe_whole, ThinVec};
@ -207,7 +208,7 @@ impl<'a> Parser<'a> {
/// Parses a local variable declaration.
fn parse_local(&mut self, attrs: ThinVec<Attribute>) -> PResult<'a, P<Local>> {
let lo = self.prev_span;
let pat = self.parse_top_level_pat()?;
let pat = self.parse_top_pat(GateOr::Yes)?;
let (err, ty) = if self.eat(&token::Colon) {
// Save the state of the parser before parsing type normally, in case there is a `:`

2
src/test/ui/anon-params-denied-2018.rs
View File

@ -3,7 +3,7 @@
// edition:2018
trait T {
fn foo(i32); //~ expected one of `:` or `@`, found `)`
fn foo(i32); //~ expected one of `:`, `@`, or `|`, found `)`
fn bar_with_default_impl(String, String) {}
//~^ ERROR expected one of `:`

16
src/test/ui/anon-params-denied-2018.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:` or `@`, found `)`
error: expected one of `:`, `@`, or `|`, found `)`
--> $DIR/anon-params-denied-2018.rs:6:15
|
LL | fn foo(i32);
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this was a parameter name, give it a type
@ -14,11 +14,11 @@ help: if this is a type, explicitly ignore the parameter name
LL | fn foo(_: i32);
| ^^^^^^
error: expected one of `:` or `@`, found `,`
error: expected one of `:`, `@`, or `|`, found `,`
--> $DIR/anon-params-denied-2018.rs:8:36
|
LL | fn bar_with_default_impl(String, String) {}
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this was a parameter name, give it a type
@ -30,11 +30,11 @@ help: if this is a type, explicitly ignore the parameter name
LL | fn bar_with_default_impl(_: String, String) {}
| ^^^^^^^^^
error: expected one of `:` or `@`, found `)`
error: expected one of `:`, `@`, or `|`, found `)`
--> $DIR/anon-params-denied-2018.rs:8:44
|
LL | fn bar_with_default_impl(String, String) {}
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this was a parameter name, give it a type
@ -46,11 +46,11 @@ help: if this is a type, explicitly ignore the parameter name
LL | fn bar_with_default_impl(String, _: String) {}
| ^^^^^^^^^
error: expected one of `:` or `@`, found `,`
error: expected one of `:`, `@`, or `|`, found `,`
--> $DIR/anon-params-denied-2018.rs:13:22
|
LL | fn baz(a:usize, b, c: usize) -> usize {
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this was a parameter name, give it a type

7
src/test/ui/did_you_mean/multiple-pattern-typo.rs
View File

@ -1,7 +0,0 @@
fn main() {
let x = 3;
match x {
1 | 2 || 3 => (), //~ ERROR unexpected token `||` after pattern
_ => (),
}
}

8
src/test/ui/did_you_mean/multiple-pattern-typo.stderr
View File

@ -1,8 +0,0 @@
error: unexpected token `||` after pattern
--> $DIR/multiple-pattern-typo.rs:4:15
|
LL | 1 | 2 || 3 => (),
| ^^ help: use a single `|` to specify multiple patterns: `|`
error: aborting due to previous error

9
src/test/ui/feature-gate/feature-gate-or_patterns.rs
View File

@ -1,9 +0,0 @@
#![crate_type="lib"]
pub fn example(x: Option<usize>) {
match x {
Some(0 | 1 | 2) => {}
//~^ ERROR: or-patterns syntax is experimental
_ => {}
}
}

8
src/test/ui/or-patterns/feature-gate-or_patterns-leading-for.rs Normal file
View File

@ -0,0 +1,8 @@
// Test feature gating for a sole leading `|` in `let`.
fn main() {}
#[cfg(FALSE)]
fn gated_leading_vert_in_let() {
for | A in 0 {} //~ ERROR or-patterns syntax is experimental
}

6
src/test/ui/feature-gate/feature-gate-or_patterns.stderr → src/test/ui/or-patterns/feature-gate-or_patterns-leading-for.stderr
View File

@ -1,8 +1,8 @@
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:5:14
--> $DIR/feature-gate-or_patterns-leading-for.rs:7:9
|
LL | Some(0 | 1 | 2) => {}
| ^^^^^^^^^
LL | for | A in 0 {}
| ^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable

8
src/test/ui/or-patterns/feature-gate-or_patterns-leading-let.rs Normal file
View File

@ -0,0 +1,8 @@
// Test feature gating for a sole leading `|` in `let`.
fn main() {}
#[cfg(FALSE)]
fn gated_leading_vert_in_let() {
let | A; //~ ERROR or-patterns syntax is experimental
}

12
src/test/ui/or-patterns/feature-gate-or_patterns-leading-let.stderr Normal file
View File

@ -0,0 +1,12 @@
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns-leading-let.rs:7:9
|
LL | let | A;
| ^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error: aborting due to previous error
For more information about this error, try `rustc --explain E0658`.

52
src/test/ui/or-patterns/feature-gate-or_patterns.rs Normal file
View File

@ -0,0 +1,52 @@
fn main() {}
pub fn example(x: Option<usize>) {
match x {
Some(0 | 1 | 2) => {}
//~^ ERROR: or-patterns syntax is experimental
_ => {}
}
}
// Test the `pat` macro fragment parser:
macro_rules! accept_pat {
($p:pat) => {}
}
accept_pat!((p | q)); //~ ERROR or-patterns syntax is experimental
accept_pat!((p | q,)); //~ ERROR or-patterns syntax is experimental
accept_pat!(TS(p | q)); //~ ERROR or-patterns syntax is experimental
accept_pat!(NS { f: p | q }); //~ ERROR or-patterns syntax is experimental
accept_pat!([p | q]); //~ ERROR or-patterns syntax is experimental
// Non-macro tests:
#[cfg(FALSE)]
fn or_patterns() {
// Gated:
let | A | B; //~ ERROR or-patterns syntax is experimental
let A | B; //~ ERROR or-patterns syntax is experimental
for | A | B in 0 {} //~ ERROR or-patterns syntax is experimental
for A | B in 0 {} //~ ERROR or-patterns syntax is experimental
fn fun((A | B): _) {} //~ ERROR or-patterns syntax is experimental
let _ = |(A | B): u8| (); //~ ERROR or-patterns syntax is experimental
let (A | B); //~ ERROR or-patterns syntax is experimental
let (A | B,); //~ ERROR or-patterns syntax is experimental
let A(B | C); //~ ERROR or-patterns syntax is experimental
let E::V(B | C); //~ ERROR or-patterns syntax is experimental
let S { f1: B | C, f2 }; //~ ERROR or-patterns syntax is experimental
let E::V { f1: B | C, f2 }; //~ ERROR or-patterns syntax is experimental
let [A | B]; //~ ERROR or-patterns syntax is experimental
// Top level of `while`, `if`, and `match` arms are allowed:
while let | A = 0 {}
while let A | B = 0 {}
if let | A = 0 {}
if let A | B = 0 {}
match 0 {
| A => {},
A | B => {},
}
}

174
src/test/ui/or-patterns/feature-gate-or_patterns.stderr Normal file
View File

@ -0,0 +1,174 @@
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:5:14
|
LL | Some(0 | 1 | 2) => {}
| ^^^^^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:28:11
|
LL | let | A | B;
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:29:9
|
LL | let A | B;
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:30:11
|
LL | for | A | B in 0 {}
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:31:9
|
LL | for A | B in 0 {}
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:32:13
|
LL | fn fun((A | B): _) {}
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:33:15
|
LL | let _ = |(A | B): u8| ();
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:34:10
|
LL | let (A | B);
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:35:10
|
LL | let (A | B,);
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:36:11
|
LL | let A(B | C);
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:37:14
|
LL | let E::V(B | C);
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:38:17
|
LL | let S { f1: B | C, f2 };
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:39:20
|
LL | let E::V { f1: B | C, f2 };
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:40:10
|
LL | let [A | B];
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:16:14
|
LL | accept_pat!((p | q));
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:17:14
|
LL | accept_pat!((p | q,));
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:18:16
|
LL | accept_pat!(TS(p | q));
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:19:21
|
LL | accept_pat!(NS { f: p | q });
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error[E0658]: or-patterns syntax is experimental
--> $DIR/feature-gate-or_patterns.rs:20:14
|
LL | accept_pat!([p | q]);
| ^^^^^
|
= note: for more information, see https://github.com/rust-lang/rust/issues/54883
= help: add `#![feature(or_patterns)]` to the crate attributes to enable
error: aborting due to 19 previous errors
For more information about this error, try `rustc --explain E0658`.

14
src/test/ui/or-patterns/fn-param-wrap-parens.fixed Normal file
View File

@ -0,0 +1,14 @@
// Test the suggestion to wrap an or-pattern as a function parameter in parens.
// run-rustfix
#![feature(or_patterns)]
#![allow(warnings)]
fn main() {}
enum E { A, B }
use E::*;
#[cfg(FALSE)]
fn fun1((A | B): E) {} //~ ERROR an or-pattern parameter must be wrapped in parenthesis

14
src/test/ui/or-patterns/fn-param-wrap-parens.rs Normal file
View File

@ -0,0 +1,14 @@
// Test the suggestion to wrap an or-pattern as a function parameter in parens.
// run-rustfix
#![feature(or_patterns)]
#![allow(warnings)]
fn main() {}
enum E { A, B }
use E::*;
#[cfg(FALSE)]
fn fun1(A | B: E) {} //~ ERROR an or-pattern parameter must be wrapped in parenthesis

8
src/test/ui/or-patterns/fn-param-wrap-parens.stderr Normal file
View File

@ -0,0 +1,8 @@
error: an or-pattern parameter must be wrapped in parenthesis
--> $DIR/fn-param-wrap-parens.rs:14:9
|
LL | fn fun1(A | B: E) {}
| ^^^^^ help: wrap the pattern in parenthesis: `(A | B)`
error: aborting due to previous error

45
src/test/ui/or-patterns/multiple-pattern-typo.rs Normal file
View File

@ -0,0 +1,45 @@
#![feature(or_patterns)]
//~^ WARN the feature `or_patterns` is incomplete and may cause the compiler to crash
fn main() {
let x = 3;
match x {
1 | 2 || 3 => (), //~ ERROR unexpected token `||` after pattern
_ => (),
}
match x {
(1 | 2 || 3) => (), //~ ERROR unexpected token `||` after pattern
_ => (),
}
match (x,) {
(1 | 2 || 3,) => (), //~ ERROR unexpected token `||` after pattern
_ => (),
}
struct TS(u8);
match TS(x) {
TS(1 | 2 || 3) => (), //~ ERROR unexpected token `||` after pattern
_ => (),
}
struct NS { f: u8 }
match (NS { f: x }) {
NS { f: 1 | 2 || 3 } => (), //~ ERROR unexpected token `||` after pattern
_ => (),
}
match [x] {
[1 | 2 || 3] => (), //~ ERROR unexpected token `||` after pattern
_ => (),
}
match x {
|| 1 | 2 | 3 => (), //~ ERROR unexpected token `||` after pattern
_ => (),
}
}

52
src/test/ui/or-patterns/multiple-pattern-typo.stderr Normal file
View File

@ -0,0 +1,52 @@
error: unexpected token `||` after pattern
--> $DIR/multiple-pattern-typo.rs:8:15
|
LL | 1 | 2 || 3 => (),
| ^^ help: use a single `|` to separate multiple alternative patterns: `|`
error: unexpected token `||` after pattern
--> $DIR/multiple-pattern-typo.rs:13:16
|
LL | (1 | 2 || 3) => (),
| ^^ help: use a single `|` to separate multiple alternative patterns: `|`
error: unexpected token `||` after pattern
--> $DIR/multiple-pattern-typo.rs:18:16
|
LL | (1 | 2 || 3,) => (),
| ^^ help: use a single `|` to separate multiple alternative patterns: `|`
error: unexpected token `||` after pattern
--> $DIR/multiple-pattern-typo.rs:25:18
|
LL | TS(1 | 2 || 3) => (),
| ^^ help: use a single `|` to separate multiple alternative patterns: `|`
error: unexpected token `||` after pattern
--> $DIR/multiple-pattern-typo.rs:32:23
|
LL | NS { f: 1 | 2 || 3 } => (),
| ^^ help: use a single `|` to separate multiple alternative patterns: `|`
error: unexpected token `||` after pattern
--> $DIR/multiple-pattern-typo.rs:37:16
|
LL | [1 | 2 || 3] => (),
| ^^ help: use a single `|` to separate multiple alternative patterns: `|`
error: unexpected token `||` after pattern
--> $DIR/multiple-pattern-typo.rs:42:9
|
LL | || 1 | 2 | 3 => (),
| ^^ help: use a single `|` to separate multiple alternative patterns: `|`
warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
--> $DIR/multiple-pattern-typo.rs:1:12
|
LL | #![feature(or_patterns)]
| ^^^^^^^^^^^
|
= note: `#[warn(incomplete_features)]` on by default
error: aborting due to 7 previous errors

0
src/test/ui/or-pattern-mismatch.rs → src/test/ui/or-patterns/or-pattern-mismatch.rs
View File

0
src/test/ui/or-pattern-mismatch.stderr → src/test/ui/or-patterns/or-pattern-mismatch.stderr
View File

53
src/test/ui/or-patterns/or-patterns-syntactic-fail.rs Normal file
View File

@ -0,0 +1,53 @@
// Test some cases where or-patterns may ostensibly be allowed but are in fact not.
// This is not a semantic test. We only test parsing.
#![feature(or_patterns)]
//~^ WARN the feature `or_patterns` is incomplete and may cause the compiler to crash
fn main() {}
// Test the `pat` macro fragment parser:
macro_rules! accept_pat {
($p:pat) => {}
}
accept_pat!(p | q); //~ ERROR no rules expected the token `|`
accept_pat!(| p | q); //~ ERROR no rules expected the token `|`
// Non-macro tests:
enum E { A, B }
use E::*;
fn no_top_level_or_patterns() {
// We do *not* allow or-patterns at the top level of lambdas...
let _ = |A | B: E| (); //~ ERROR binary operation `|` cannot be applied to type `E`
// -------- This looks like an or-pattern but is in fact `|A| (B: E | ())`.
// ...and for now neither do we allow or-patterns at the top level of functions.
fn fun1(A | B: E) {} //~ ERROR an or-pattern parameter must be wrapped in parenthesis
fn fun2(| A | B: E) {}
//~^ ERROR a leading `|` is not allowed in a parameter pattern
//~| ERROR an or-pattern parameter must be wrapped in parenthesis
}
// We also do not allow a leading `|` when not in a top level position:
fn no_leading_inner() {
struct TS(E);
struct NS { f: E }
let ( | A | B) = E::A; //~ ERROR a leading `|` is only allowed in a top-level pattern
let ( | A | B,) = (E::B,); //~ ERROR a leading `|` is only allowed in a top-level pattern
let [ | A | B ] = [E::A]; //~ ERROR a leading `|` is only allowed in a top-level pattern
let TS( | A | B ); //~ ERROR a leading `|` is only allowed in a top-level pattern
let NS { f: | A | B }; //~ ERROR a leading `|` is only allowed in a top-level pattern
let ( || A | B) = E::A; //~ ERROR a leading `|` is only allowed in a top-level pattern
let [ || A | B ] = [E::A]; //~ ERROR a leading `|` is only allowed in a top-level pattern
let TS( || A | B ); //~ ERROR a leading `|` is only allowed in a top-level pattern
let NS { f: || A | B }; //~ ERROR a leading `|` is only allowed in a top-level pattern
let recovery_witness: String = 0; //~ ERROR mismatched types
}

124
src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr Normal file
View File

@ -0,0 +1,124 @@
error: an or-pattern parameter must be wrapped in parenthesis
--> $DIR/or-patterns-syntactic-fail.rs:28:13
|
LL | fn fun1(A | B: E) {}
| ^^^^^ help: wrap the pattern in parenthesis: `(A | B)`
error: a leading `|` is not allowed in a parameter pattern
--> $DIR/or-patterns-syntactic-fail.rs:30:13
|
LL | fn fun2(| A | B: E) {}
| ^ help: remove the `|`
error: an or-pattern parameter must be wrapped in parenthesis
--> $DIR/or-patterns-syntactic-fail.rs:30:15
|
LL | fn fun2(| A | B: E) {}
| ^^^^^ help: wrap the pattern in parenthesis: `(A | B)`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/or-patterns-syntactic-fail.rs:41:11
|
LL | let ( | A | B) = E::A;
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/or-patterns-syntactic-fail.rs:42:11
|
LL | let ( | A | B,) = (E::B,);
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/or-patterns-syntactic-fail.rs:43:11
|
LL | let [ | A | B ] = [E::A];
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/or-patterns-syntactic-fail.rs:44:13
|
LL | let TS( | A | B );
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/or-patterns-syntactic-fail.rs:45:17
|
LL | let NS { f: | A | B };
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/or-patterns-syntactic-fail.rs:47:11
|
LL | let ( || A | B) = E::A;
| ^^ help: remove the `||`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/or-patterns-syntactic-fail.rs:48:11
|
LL | let [ || A | B ] = [E::A];
| ^^ help: remove the `||`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/or-patterns-syntactic-fail.rs:49:13
|
LL | let TS( || A | B );
| ^^ help: remove the `||`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/or-patterns-syntactic-fail.rs:50:17
|
LL | let NS { f: || A | B };
| ^^ help: remove the `||`
error: no rules expected the token `|`
--> $DIR/or-patterns-syntactic-fail.rs:14:15
|
LL | macro_rules! accept_pat {
| ----------------------- when calling this macro
...
LL | accept_pat!(p | q);
| ^ no rules expected this token in macro call
error: no rules expected the token `|`
--> $DIR/or-patterns-syntactic-fail.rs:15:13
|
LL | macro_rules! accept_pat {
| ----------------------- when calling this macro
...
LL | accept_pat!(| p | q);
| ^ no rules expected this token in macro call
warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
--> $DIR/or-patterns-syntactic-fail.rs:4:12
|
LL | #![feature(or_patterns)]
| ^^^^^^^^^^^
|
= note: `#[warn(incomplete_features)]` on by default
error[E0369]: binary operation `|` cannot be applied to type `E`
--> $DIR/or-patterns-syntactic-fail.rs:24:22
|
LL | let _ = |A | B: E| ();
| ----^ -- ()
| |
| E
|
= note: an implementation of `std::ops::BitOr` might be missing for `E`
error[E0308]: mismatched types
--> $DIR/or-patterns-syntactic-fail.rs:52:36
|
LL | let recovery_witness: String = 0;
| ^
| |
| expected struct `std::string::String`, found integer
| help: try using a conversion method: `0.to_string()`
|
= note: expected type `std::string::String`
found type `{integer}`
error: aborting due to 16 previous errors
Some errors have detailed explanations: E0308, E0369.
For more information about an error, try `rustc --explain E0308`.

78
src/test/ui/or-patterns/or-patterns-syntactic-pass.rs Normal file
View File

@ -0,0 +1,78 @@
// Here we test all the places `|` is *syntactically* allowed.
// This is not a semantic test. We only test parsing.
// check-pass
#![feature(or_patterns)]
fn main() {}
// Test the `pat` macro fragment parser:
macro_rules! accept_pat {
($p:pat) => {}
}
accept_pat!((p | q));
accept_pat!((p | q,));
accept_pat!(TS(p | q));
accept_pat!(NS { f: p | q });
accept_pat!([p | q]);
// Non-macro tests:
#[cfg(FALSE)]
fn or_patterns() {
// Top level of `let`:
let | A | B;
let A | B;
let A | B: u8;
let A | B = 0;
let A | B: u8 = 0;
// Top level of `for`:
for | A | B in 0 {}
for A | B in 0 {}
// Top level of `while`:
while let | A | B = 0 {}
while let A | B = 0 {}
// Top level of `if`:
if let | A | B = 0 {}
if let A | B = 0 {}
// Top level of `match` arms:
match 0 {
| A | B => {},
A | B => {},
}
// Functions:
fn fun((A | B): _) {}
// Lambdas:
let _ = |(A | B): u8| ();
// Parenthesis and tuple patterns:
let (A | B);
let (A | B,);
// Tuple struct patterns:
let A(B | C);
let E::V(B | C);
// Struct patterns:
let S { f1: B | C, f2 };
let E::V { f1: B | C, f2 };
// Slice patterns:
let [A | B, .. | ..];
// These bind as `(prefix p) | q` as opposed to `prefix (p | q)`:
let box 0 | 1; // Unstable; we *can* the precedence if we want.
let &0 | 1;
let &mut 0 | 1;
let x @ 0 | 1;
let ref x @ 0 | 1;
let ref mut x @ 0 | 1;
}

8
src/test/ui/or-patterns/or-patterns-syntactic-pass.stderr Normal file
View File

@ -0,0 +1,8 @@
warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
--> $DIR/or-patterns-syntactic-pass.rs:6:12
|
LL | #![feature(or_patterns)]
| ^^^^^^^^^^^
|
= note: `#[warn(incomplete_features)]` on by default

23
src/test/ui/or-patterns/remove-leading-vert.fixed Normal file
View File

@ -0,0 +1,23 @@
// Test the suggestion to remove a leading `|`.
// run-rustfix
#![feature(or_patterns)]
#![allow(warnings)]
fn main() {}
#[cfg(FALSE)]
fn leading_vert() {
fn fun1( A: E) {} //~ ERROR a leading `|` is not allowed in a parameter pattern
fn fun2( A: E) {} //~ ERROR a leading `|` is not allowed in a parameter pattern
let ( A): E; //~ ERROR a leading `|` is only allowed in a top-level pattern
let ( A): (E); //~ ERROR a leading `|` is only allowed in a top-level pattern
let ( A,): (E,); //~ ERROR a leading `|` is only allowed in a top-level pattern
let [ A ]: [E; 1]; //~ ERROR a leading `|` is only allowed in a top-level pattern
let [ A ]: [E; 1]; //~ ERROR a leading `|` is only allowed in a top-level pattern
let TS( A ): TS; //~ ERROR a leading `|` is only allowed in a top-level pattern
let TS( A ): TS; //~ ERROR a leading `|` is only allowed in a top-level pattern
let NS { f: A }: NS; //~ ERROR a leading `|` is only allowed in a top-level pattern
let NS { f: A }: NS; //~ ERROR a leading `|` is only allowed in a top-level pattern
}

23
src/test/ui/or-patterns/remove-leading-vert.rs Normal file
View File

@ -0,0 +1,23 @@
// Test the suggestion to remove a leading `|`.
// run-rustfix
#![feature(or_patterns)]
#![allow(warnings)]
fn main() {}
#[cfg(FALSE)]
fn leading_vert() {
fn fun1( | A: E) {} //~ ERROR a leading `|` is not allowed in a parameter pattern
fn fun2( || A: E) {} //~ ERROR a leading `|` is not allowed in a parameter pattern
let ( | A): E; //~ ERROR a leading `|` is only allowed in a top-level pattern
let ( || A): (E); //~ ERROR a leading `|` is only allowed in a top-level pattern
let ( | A,): (E,); //~ ERROR a leading `|` is only allowed in a top-level pattern
let [ | A ]: [E; 1]; //~ ERROR a leading `|` is only allowed in a top-level pattern
let [ || A ]: [E; 1]; //~ ERROR a leading `|` is only allowed in a top-level pattern
let TS( | A ): TS; //~ ERROR a leading `|` is only allowed in a top-level pattern
let TS( || A ): TS; //~ ERROR a leading `|` is only allowed in a top-level pattern
let NS { f: | A }: NS; //~ ERROR a leading `|` is only allowed in a top-level pattern
let NS { f: || A }: NS; //~ ERROR a leading `|` is only allowed in a top-level pattern
}

68
src/test/ui/or-patterns/remove-leading-vert.stderr Normal file
View File

@ -0,0 +1,68 @@
error: a leading `|` is not allowed in a parameter pattern
--> $DIR/remove-leading-vert.rs:12:14
|
LL | fn fun1( | A: E) {}
| ^ help: remove the `|`
error: a leading `|` is not allowed in a parameter pattern
--> $DIR/remove-leading-vert.rs:13:14
|
LL | fn fun2( || A: E) {}
| ^^ help: remove the `||`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/remove-leading-vert.rs:14:11
|
LL | let ( | A): E;
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/remove-leading-vert.rs:15:11
|
LL | let ( || A): (E);
| ^^ help: remove the `||`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/remove-leading-vert.rs:16:11
|
LL | let ( | A,): (E,);
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/remove-leading-vert.rs:17:11
|
LL | let [ | A ]: [E; 1];
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/remove-leading-vert.rs:18:11
|
LL | let [ || A ]: [E; 1];
| ^^ help: remove the `||`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/remove-leading-vert.rs:19:13
|
LL | let TS( | A ): TS;
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/remove-leading-vert.rs:20:13
|
LL | let TS( || A ): TS;
| ^^ help: remove the `||`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/remove-leading-vert.rs:21:17
|
LL | let NS { f: | A }: NS;
| ^ help: remove the `|`
error: a leading `|` is only allowed in a top-level pattern
--> $DIR/remove-leading-vert.rs:22:17
|
LL | let NS { f: || A }: NS;
| ^^ help: remove the `||`
error: aborting due to 11 previous errors

9
src/test/ui/or-patterns/while-parsing-this-or-pattern.rs Normal file
View File

@ -0,0 +1,9 @@
// Test the parser for the "while parsing this or-pattern..." label here.
fn main() {
match Some(42) {
Some(42) | .=. => {} //~ ERROR expected pattern, found `.`
//~^ while parsing this or-pattern staring here
//~| NOTE expected pattern
}
}

10
src/test/ui/or-patterns/while-parsing-this-or-pattern.stderr Normal file
View File

@ -0,0 +1,10 @@
error: expected pattern, found `.`
--> $DIR/while-parsing-this-or-pattern.rs:5:20
|
LL | Some(42) | .=. => {}
| -------- ^ expected pattern
| |
| while parsing this or-pattern staring here
error: aborting due to previous error

2
src/test/ui/parser/bad-match.rs
View File

@ -1,4 +1,4 @@
fn main() {
let isize x = 5; //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `x`
let isize x = 5; //~ ERROR expected one of `:`, `;`, `=`, `@`, or `|`, found `x`
match x;
}

4
src/test/ui/parser/bad-match.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:`, `;`, `=`, or `@`, found `x`
error: expected one of `:`, `;`, `=`, `@`, or `|`, found `x`
--> $DIR/bad-match.rs:2:13
|
LL | let isize x = 5;
| ^ expected one of `:`, `;`, `=`, or `@` here
| ^ expected one of `:`, `;`, `=`, `@`, or `|` here
error: aborting due to previous error

4
src/test/ui/parser/bad-name.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:`, `;`, `=`, or `@`, found `.`
error: expected one of `:`, `;`, `=`, `@`, or `|`, found `.`
--> $DIR/bad-name.rs:4:8
|
LL | let x.y::<isize>.z foo;
| ^ expected one of `:`, `;`, `=`, or `@` here
| ^ expected one of `:`, `;`, `=`, `@`, or `|` here
error: aborting due to previous error

12
src/test/ui/parser/inverted-parameters.rs
View File

@ -2,29 +2,29 @@ struct S;
impl S {
fn foo(&self, &str bar) {}
//~^ ERROR expected one of `:` or `@`
//~^ ERROR expected one of `:`, `@`
//~| HELP declare the type after the parameter binding
//~| SUGGESTION <identifier>: <type>
}
fn baz(S quux, xyzzy: i32) {}
//~^ ERROR expected one of `:` or `@`
//~^ ERROR expected one of `:`, `@`
//~| HELP declare the type after the parameter binding
//~| SUGGESTION <identifier>: <type>
fn one(i32 a b) {}
//~^ ERROR expected one of `:` or `@`
//~^ ERROR expected one of `:`, `@`
fn pattern((i32, i32) (a, b)) {}
//~^ ERROR expected `:`
//~^ ERROR expected one of `:`
fn fizz(i32) {}
//~^ ERROR expected one of `:` or `@`
//~^ ERROR expected one of `:`, `@`
//~| HELP if this was a parameter name, give it a type
//~| HELP if this is a type, explicitly ignore the parameter name
fn missing_colon(quux S) {}
//~^ ERROR expected one of `:` or `@`
//~^ ERROR expected one of `:`, `@`
//~| HELP declare the type after the parameter binding
//~| SUGGESTION <identifier>: <type>

24
src/test/ui/parser/inverted-parameters.stderr
View File

@ -1,38 +1,38 @@
error: expected one of `:` or `@`, found `bar`
error: expected one of `:`, `@`, or `|`, found `bar`
--> $DIR/inverted-parameters.rs:4:24
|
LL | fn foo(&self, &str bar) {}
| -----^^^
| | |
| | expected one of `:` or `@` here
| | expected one of `:`, `@`, or `|` here
| help: declare the type after the parameter binding: `<identifier>: <type>`
error: expected one of `:` or `@`, found `quux`
error: expected one of `:`, `@`, or `|`, found `quux`
--> $DIR/inverted-parameters.rs:10:10
|
LL | fn baz(S quux, xyzzy: i32) {}
| --^^^^
| | |
| | expected one of `:` or `@` here
| | expected one of `:`, `@`, or `|` here
| help: declare the type after the parameter binding: `<identifier>: <type>`
error: expected one of `:` or `@`, found `a`
error: expected one of `:`, `@`, or `|`, found `a`
--> $DIR/inverted-parameters.rs:15:12
|
LL | fn one(i32 a b) {}
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
error: expected `:`, found `(`
error: expected one of `:` or `|`, found `(`
--> $DIR/inverted-parameters.rs:18:23
|
LL | fn pattern((i32, i32) (a, b)) {}
| ^ expected `:`
| ^ expected one of `:` or `|` here
error: expected one of `:` or `@`, found `)`
error: expected one of `:`, `@`, or `|`, found `)`
--> $DIR/inverted-parameters.rs:21:12
|
LL | fn fizz(i32) {}
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this was a parameter name, give it a type
@ -44,13 +44,13 @@ help: if this is a type, explicitly ignore the parameter name
LL | fn fizz(_: i32) {}
| ^^^^^^
error: expected one of `:` or `@`, found `S`
error: expected one of `:`, `@`, or `|`, found `S`
--> $DIR/inverted-parameters.rs:26:23
|
LL | fn missing_colon(quux S) {}
| -----^
| | |
| | expected one of `:` or `@` here
| | expected one of `:`, `@`, or `|` here
| help: declare the type after the parameter binding: `<identifier>: <type>`
error: aborting due to 6 previous errors

2
src/test/ui/parser/issue-22647.rs
View File

@ -1,5 +1,5 @@
fn main() {
let caller<F> = |f: F| //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `<`
let caller<F> = |f: F| //~ ERROR expected one of `:`, `;`, `=`, `@`, or `|`, found `<`
where F: Fn() -> i32
{
let x = f();

4
src/test/ui/parser/issue-22647.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:`, `;`, `=`, or `@`, found `<`
error: expected one of `:`, `;`, `=`, `@`, or `|`, found `<`
--> $DIR/issue-22647.rs:2:15
|
LL | let caller<F> = |f: F|
| ^ expected one of `:`, `;`, `=`, or `@` here
| ^ expected one of `:`, `;`, `=`, `@`, or `|` here
error: aborting due to previous error

2
src/test/ui/parser/issue-22712.rs
View File

@ -3,7 +3,7 @@ struct Foo<B> {
}
fn bar() {
let Foo<Vec<u8>> //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `<`
let Foo<Vec<u8>> //~ ERROR expected one of `:`, `;`, `=`, `@`, or `|`, found `<`
}
fn main() {}

4
src/test/ui/parser/issue-22712.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:`, `;`, `=`, or `@`, found `<`
error: expected one of `:`, `;`, `=`, `@`, or `|`, found `<`
--> $DIR/issue-22712.rs:6:12
|
LL | let Foo<Vec<u8>>
| ^ expected one of `:`, `;`, `=`, or `@` here
| ^ expected one of `:`, `;`, `=`, `@`, or `|` here
error: aborting due to previous error

2
src/test/ui/parser/issue-24197.rs
View File

@ -1,3 +1,3 @@
fn main() {
let buf[0] = 0; //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `[`
let buf[0] = 0; //~ ERROR expected one of `:`, `;`, `=`, `@`, or `|`, found `[`
}

4
src/test/ui/parser/issue-24197.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:`, `;`, `=`, or `@`, found `[`
error: expected one of `:`, `;`, `=`, `@`, or `|`, found `[`
--> $DIR/issue-24197.rs:2:12
|
LL | let buf[0] = 0;
| ^ expected one of `:`, `;`, `=`, or `@` here
| ^ expected one of `:`, `;`, `=`, `@`, or `|` here
error: aborting due to previous error

2
src/test/ui/parser/issue-33413.rs
View File

@ -2,7 +2,7 @@ struct S;
impl S {
fn f(*, a: u8) -> u8 {}
//~^ ERROR expected argument name, found `*`
//~^ ERROR expected parameter name, found `*`
}
fn main() {}

4
src/test/ui/parser/issue-33413.stderr
View File

@ -1,8 +1,8 @@
error: expected argument name, found `*`
error: expected parameter name, found `*`
--> $DIR/issue-33413.rs:4:10
|
LL | fn f(*, a: u8) -> u8 {}
| ^ expected argument name
| ^ expected parameter name
error: aborting due to previous error

2
src/test/ui/parser/issue-63135.rs
View File

@ -1,3 +1,3 @@
// error-pattern: aborting due to 6 previous errors
// error-pattern: aborting due to 5 previous errors
fn i(n{...,f #

12
src/test/ui/parser/issue-63135.stderr
View File

@ -28,17 +28,11 @@ error: expected `[`, found `}`
LL | fn i(n{...,f #
| ^ expected `[`
error: expected `:`, found `)`
error: expected one of `:` or `|`, found `)`
--> $DIR/issue-63135.rs:3:15
|
LL | fn i(n{...,f #
| ^ expected `:`
| ^ expected one of `:` or `|` here
error: expected one of `->`, `where`, or `{`, found `<eof>`
--> $DIR/issue-63135.rs:3:15
|
LL | fn i(n{...,f #
| ^ expected one of `->`, `where`, or `{` here
error: aborting due to 6 previous errors
error: aborting due to 5 previous errors

3
src/test/ui/parser/mut-patterns.rs
View File

@ -2,5 +2,6 @@
pub fn main() {
struct Foo { x: isize }
let mut Foo { x: x } = Foo { x: 3 }; //~ ERROR: expected one of `:`, `;`, `=`, or `@`, found `{`
let mut Foo { x: x } = Foo { x: 3 };
//~^ ERROR: expected one of `:`, `;`, `=`, `@`, or `|`, found `{`
}

4
src/test/ui/parser/mut-patterns.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:`, `;`, `=`, or `@`, found `{`
error: expected one of `:`, `;`, `=`, `@`, or `|`, found `{`
--> $DIR/mut-patterns.rs:5:17
|
LL | let mut Foo { x: x } = Foo { x: 3 };
| ^ expected one of `:`, `;`, `=`, or `@` here
| ^ expected one of `:`, `;`, `=`, `@`, or `|` here
error: aborting due to previous error

2
src/test/ui/parser/omitted-arg-in-item-fn.rs
View File

@ -1,4 +1,4 @@
fn foo(x) { //~ ERROR expected one of `:` or `@`, found `)`
fn foo(x) { //~ ERROR expected one of `:`, `@`, or `|`, found `)`
}
fn main() {}

4
src/test/ui/parser/omitted-arg-in-item-fn.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:` or `@`, found `)`
error: expected one of `:`, `@`, or `|`, found `)`
--> $DIR/omitted-arg-in-item-fn.rs:1:9
|
LL | fn foo(x) {
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this was a parameter name, give it a type

2
src/test/ui/parser/pat-lt-bracket-2.rs
View File

@ -1,4 +1,4 @@
fn a(B<) {}
//~^ error: expected one of `:` or `@`, found `<`
//~^ error: expected one of `:`, `@`, or `|`, found `<`
fn main() {}

4
src/test/ui/parser/pat-lt-bracket-2.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:` or `@`, found `<`
error: expected one of `:`, `@`, or `|`, found `<`
--> $DIR/pat-lt-bracket-2.rs:1:7
|
LL | fn a(B<) {}
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
error: aborting due to previous error

2
src/test/ui/parser/pat-lt-bracket-5.rs
View File

@ -1,3 +1,3 @@
fn main() {
let v[0] = v[1]; //~ ERROR expected one of `:`, `;`, `=`, or `@`, found `[`
let v[0] = v[1]; //~ ERROR expected one of `:`, `;`, `=`, `@`, or `|`, found `[`
}

4
src/test/ui/parser/pat-lt-bracket-5.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:`, `;`, `=`, or `@`, found `[`
error: expected one of `:`, `;`, `=`, `@`, or `|`, found `[`
--> $DIR/pat-lt-bracket-5.rs:2:10
|
LL | let v[0] = v[1];
| ^ expected one of `:`, `;`, `=`, or `@` here
| ^ expected one of `:`, `;`, `=`, `@`, or `|` here
error: aborting due to previous error

2
src/test/ui/parser/pat-ranges-1.rs
View File

@ -1,5 +1,5 @@
// Parsing of range patterns
fn main() {
let macropus!() ..= 11 = 12; //~ error: expected one of `:`, `;`, or `=`, found `..=`
let macropus!() ..= 11 = 12; //~ error: expected one of `:`, `;`, `=`, or `|`, found `..=`
}

4
src/test/ui/parser/pat-ranges-1.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:`, `;`, or `=`, found `..=`
error: expected one of `:`, `;`, `=`, or `|`, found `..=`
--> $DIR/pat-ranges-1.rs:4:21
|
LL | let macropus!() ..= 11 = 12;
| ^^^ expected one of `:`, `;`, or `=` here
| ^^^ expected one of `:`, `;`, `=`, or `|` here
error: aborting due to previous error

2
src/test/ui/parser/pat-ranges-2.rs
View File

@ -1,5 +1,5 @@
// Parsing of range patterns
fn main() {
let 10 ..= makropulos!() = 12; //~ error: expected one of `::`, `:`, `;`, or `=`, found `!`
let 10 ..= makropulos!() = 12; //~ error: expected one of `::`, `:`, `;`, `=`, or `|`, found `!`
}

4
src/test/ui/parser/pat-ranges-2.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `::`, `:`, `;`, or `=`, found `!`
error: expected one of `::`, `:`, `;`, `=`, or `|`, found `!`
--> $DIR/pat-ranges-2.rs:4:26
|
LL | let 10 ..= makropulos!() = 12;
| ^ expected one of `::`, `:`, `;`, or `=` here
| ^ expected one of `::`, `:`, `;`, `=`, or `|` here
error: aborting due to previous error

2
src/test/ui/parser/pat-ranges-3.rs
View File

@ -1,5 +1,5 @@
// Parsing of range patterns
fn main() {
let 10 ..= 10 + 3 = 12; //~ expected one of `:`, `;`, or `=`, found `+`
let 10 ..= 10 + 3 = 12; //~ expected one of `:`, `;`, `=`, or `|`, found `+`
}

4
src/test/ui/parser/pat-ranges-3.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:`, `;`, or `=`, found `+`
error: expected one of `:`, `;`, `=`, or `|`, found `+`
--> $DIR/pat-ranges-3.rs:4:19
|
LL | let 10 ..= 10 + 3 = 12;
| ^ expected one of `:`, `;`, or `=` here
| ^ expected one of `:`, `;`, `=`, or `|` here
error: aborting due to previous error

2
src/test/ui/parser/pat-ranges-4.rs
View File

@ -2,5 +2,5 @@
fn main() {
let 10 - 3 ..= 10 = 8;
//~^ error: expected one of `...`, `..=`, `..`, `:`, `;`, or `=`, found `-`
//~^ error: expected one of `...`, `..=`, `..`, `:`, `;`, `=`, or `|`, found `-`
}

4
src/test/ui/parser/pat-ranges-4.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `...`, `..=`, `..`, `:`, `;`, or `=`, found `-`
error: expected one of `...`, `..=`, `..`, `:`, `;`, `=`, or `|`, found `-`
--> $DIR/pat-ranges-4.rs:4:12
|
LL | let 10 - 3 ..= 10 = 8;
| ^ expected one of `...`, `..=`, `..`, `:`, `;`, or `=` here
| ^ expected one of 7 possible tokens here
error: aborting due to previous error

2
src/test/ui/parser/removed-syntax-mode.rs
View File

@ -1,4 +1,4 @@
fn f(+x: isize) {}
//~^ ERROR expected argument name, found `+`
//~^ ERROR expected parameter name, found `+`
fn main() {}

4
src/test/ui/parser/removed-syntax-mode.stderr
View File

@ -1,8 +1,8 @@
error: expected argument name, found `+`
error: expected parameter name, found `+`
--> $DIR/removed-syntax-mode.rs:1:6
|
LL | fn f(+x: isize) {}
| ^ expected argument name
| ^ expected parameter name
error: aborting due to previous error

2
src/test/ui/rfc-2565-param-attrs/param-attrs-2018.rs
View File

@ -3,6 +3,6 @@
#![feature(param_attrs)]
trait Trait2015 { fn foo(#[allow(C)] i32); }
//~^ ERROR expected one of `:` or `@`, found `)`
//~^ ERROR expected one of `:`, `@`, or `|`, found `)`
fn main() {}

4
src/test/ui/rfc-2565-param-attrs/param-attrs-2018.stderr
View File

@ -1,8 +1,8 @@
error: expected one of `:` or `@`, found `)`
error: expected one of `:`, `@`, or `|`, found `)`
--> $DIR/param-attrs-2018.rs:5:41
|
LL | trait Trait2015 { fn foo(#[allow(C)] i32); }
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this was a parameter name, give it a type

12
src/test/ui/span/issue-34264.stderr
View File

@ -1,14 +1,14 @@
error: expected one of `:` or `@`, found `<`
error: expected one of `:`, `@`, or `|`, found `<`
--> $DIR/issue-34264.rs:1:14
|
LL | fn foo(Option<i32>, String) {}
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
error: expected one of `:` or `@`, found `)`
error: expected one of `:`, `@`, or `|`, found `)`
--> $DIR/issue-34264.rs:1:27
|
LL | fn foo(Option<i32>, String) {}
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this was a parameter name, give it a type
@ -20,11 +20,11 @@ help: if this is a type, explicitly ignore the parameter name
LL | fn foo(Option<i32>, _: String) {}
| ^^^^^^^^^
error: expected one of `:` or `@`, found `,`
error: expected one of `:`, `@`, or `|`, found `,`
--> $DIR/issue-34264.rs:3:9
|
LL | fn bar(x, y: usize) {}
| ^ expected one of `:` or `@` here
| ^ expected one of `:`, `@`, or `|` here
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this was a parameter name, give it a type