Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,7 @@ impl<'a> Parser<'a> {
// definition...

// We don't allow argument names to be left off in edition 2018.
p.parse_arg_general(p.span.rust_2018())
p.parse_arg_general(p.span.rust_2018(), true)
})?;
generics.where_clause = self.parse_where_clause()?;

Expand Down Expand Up @@ -1817,7 +1817,7 @@ impl<'a> Parser<'a> {

/// This version of parse arg doesn't necessarily require
/// identifier names.
fn parse_arg_general(&mut self, require_name: bool) -> PResult<'a, Arg> {
fn parse_arg_general(&mut self, require_name: bool, is_trait_item: bool) -> PResult<'a, Arg> {
maybe_whole!(self, NtArg, |x| x);

if let Ok(Some(_)) = self.parse_self_arg() {
Expand Down Expand Up @@ -1849,6 +1849,17 @@ impl<'a> Parser<'a> {
String::from("<identifier>: <type>"),
Applicability::HasPlaceholders,
);
} else if require_name && is_trait_item {
if let PatKind::Ident(_, ident, _) = pat.node {
err.span_suggestion_with_applicability(
pat.span,
"explicitly ignore parameter",
format!("_: {}", ident),
Applicability::MachineApplicable,
);
}

err.note("anonymous parameters are removed in the 2018 edition (see RFC 1685)");
}

return Err(err);
Expand Down Expand Up @@ -1914,7 +1925,7 @@ impl<'a> Parser<'a> {

/// Parse a single function argument
crate fn parse_arg(&mut self) -> PResult<'a, Arg> {
self.parse_arg_general(true)
self.parse_arg_general(true, false)
}

/// Parse an argument in a lambda header e.g. |arg, arg|
Expand Down Expand Up @@ -5469,7 +5480,7 @@ impl<'a> Parser<'a> {
}
}
} else {
match p.parse_arg_general(named_args) {
match p.parse_arg_general(named_args, false) {
Ok(arg) => Ok(Some(arg)),
Err(mut e) => {
e.emit();
Expand Down
12 changes: 10 additions & 2 deletions src/test/ui/anon-params-denied-2018.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,21 @@ error: expected one of `:` or `@`, found `)`
--> $DIR/anon-params-denied-2018.rs:6:15
|
LL | fn foo(i32); //~ expected one of `:` or `@`, found `)`
| ^ expected one of `:` or `@` here
| ---^ expected one of `:` or `@` here
| |
| help: explicitly ignore parameter: `_: i32`
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)

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
| |
| help: explicitly ignore parameter: `_: String`
|
= note: anonymous parameters are removed in the 2018 edition (see RFC 1685)

error: aborting due to 2 previous errors