Commit 77e5bbf

authored

Rollup merge of #127889 - estebank:anon-arg-sugg, r=compiler-errors

More accurate span for anonymous argument suggestion Use smaller span for suggesting adding `_:` ahead of a type: ``` error: expected one of `(`, `...`, `..=`, `..`, `::`, `:`, `{`, or `|`, found `)` --> $DIR/anon-params-denied-2018.rs:12:47 | LL | fn foo_with_qualified_path(<Bar as T>::Baz); | ^ expected one of 8 possible tokens | = note: anonymous parameters are removed in the 2018 edition (see RFC 1685) help: explicitly ignore the parameter name | LL | fn foo_with_qualified_path(_: <Bar as T>::Baz); | ++ ```

2 parents d78be31 + f6c4679 commit 77e5bbfCopy full SHA for 77e5bbf

File tree

2 files changed

+10

-10

lines changed

compiler/rustc_parse/src/parser
- diagnostics.rs
tests/ui/anon-params
- anon-params-denied-2018.stderr

2 files changed

+10

-10

lines changed

`‎compiler/rustc_parse/src/parser/diagnostics.rs‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -2240,11 +2240,11 @@ impl<'a> Parser<'a> {`
`2240`	`2240`	`}`
`2241`	`2241`	`_ => {`
`2242`	`2242`	`// Otherwise, try to get a type and emit a suggestion.`
`2243`		`- if let Some(ty) = pat.to_ty() {`
	`2243`	`+ if let Some(_) = pat.to_ty() {`
`2244`	`2244`	`err.span_suggestion_verbose(`
`2245`		`- pat.span,`
	`2245`	`+ pat.span.shrink_to_lo(),`
`2246`	`2246`	`"explicitly ignore the parameter name",`
`2247`		`- format!("_: {}", pprust::ty_to_string(&ty)),`
	`2247`	`+ "_: ".to_string(),`
`2248`	`2248`	`Applicability::MachineApplicable,`
`2249`	`2249`	`);`
`2250`	`2250`	`err.note(rfc_note);`
`@@ -2256,7 +2256,7 @@ impl<'a> Parser<'a> {`
`2256`	`2256`
`2257`	`2257`	// `fn foo(a, b) {}`, `fn foo(a<x>, b<y>) {}` or `fn foo(usize, usize) {}`
`2258`	`2258`	`if first_param {`
`2259`		`- err.span_suggestion(`
	`2259`	`+ err.span_suggestion_verbose(`
`2260`	`2260`	`self_span,`
`2261`	`2261`	"if this is a `self` type, give it a parameter name",
`2262`	`2262`	`self_sugg,`
`@@ -2266,14 +2266,14 @@ impl<'a> Parser<'a> {`
`2266`	`2266`	// Avoid suggesting that `fn foo(HashMap<u32>)` is fixed with a change to
`2267`	`2267`	// `fn foo(HashMap: TypeName<u32>)`.
`2268`	`2268`	`if self.token != token::Lt {`
`2269`		`- err.span_suggestion(`
	`2269`	`+ err.span_suggestion_verbose(`
`2270`	`2270`	`param_span,`
`2271`	`2271`	`"if this is a parameter name, give it a type",`
`2272`	`2272`	`param_sugg,`
`2273`	`2273`	`Applicability::HasPlaceholders,`
`2274`	`2274`	`);`
`2275`	`2275`	`}`
`2276`		`- err.span_suggestion(`
	`2276`	`+ err.span_suggestion_verbose(`
`2277`	`2277`	`type_span,`
`2278`	`2278`	`"if this is a type, explicitly ignore the parameter name",`
`2279`	`2279`	`type_sugg,`

`‎tests/ui/anon-params/anon-params-denied-2018.stderr‎`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ LL \| fn foo_with_qualified_path(<Bar as T>::Baz);`
`48`	`48`	`help: explicitly ignore the parameter name`
`49`	`49`	`\|`
`50`	`50`	`LL \| fn foo_with_qualified_path(_: <Bar as T>::Baz);`
`51`		`- \| ~~~~~~~~~~~~~~~~~~`
	`51`	`+ \| ++`
`52`	`52`
`53`	`53`	error: expected one of `(`, `...`, `..=`, `..`, `::`, `:`, `{`, or `\|`, found `)`
`54`	`54`	`--> $DIR/anon-params-denied-2018.rs:15:56`
`@@ -60,7 +60,7 @@ LL \| fn foo_with_qualified_path_and_ref(&<Bar as T>::Baz);`
`60`	`60`	`help: explicitly ignore the parameter name`
`61`	`61`	`\|`
`62`	`62`	`LL \| fn foo_with_qualified_path_and_ref(_: &<Bar as T>::Baz);`
`63`		`- \| ~~~~~~~~~~~~~~~~~~~`
	`63`	`+ \| ++`
`64`	`64`
`65`	`65`	error: expected one of `(`, `...`, `..=`, `..`, `::`, `:`, `{`, or `\|`, found `,`
`66`	`66`	`--> $DIR/anon-params-denied-2018.rs:18:57`
`@@ -72,7 +72,7 @@ LL \| fn foo_with_multiple_qualified_paths(<Bar as T>::Baz, <Bar as T>::Baz);`
`72`	`72`	`help: explicitly ignore the parameter name`
`73`	`73`	`\|`
`74`	`74`	`LL \| fn foo_with_multiple_qualified_paths(_: <Bar as T>::Baz, <Bar as T>::Baz);`
`75`		`- \| ~~~~~~~~~~~~~~~~~~`
	`75`	`+ \| ++`
`76`	`76`
`77`	`77`	error: expected one of `(`, `...`, `..=`, `..`, `::`, `:`, `{`, or `\|`, found `)`
`78`	`78`	`--> $DIR/anon-params-denied-2018.rs:18:74`
`@@ -84,7 +84,7 @@ LL \| fn foo_with_multiple_qualified_paths(<Bar as T>::Baz, <Bar as T>::Baz);`
`84`	`84`	`help: explicitly ignore the parameter name`
`85`	`85`	`\|`
`86`	`86`	`LL \| fn foo_with_multiple_qualified_paths(<Bar as T>::Baz, _: <Bar as T>::Baz);`
`87`		`- \| ~~~~~~~~~~~~~~~~~~`
	`87`	`+ \| ++`
`88`	`88`
`89`	`89`	error: expected one of `:`, `@`, or `\|`, found `,`
`90`	`90`	`--> $DIR/anon-params-denied-2018.rs:22:36`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 77e5bbf

File tree

2 files changed

2 files changed

`‎compiler/rustc_parse/src/parser/diagnostics.rs‎`

`‎tests/ui/anon-params/anon-params-denied-2018.stderr‎`

0 commit comments