mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cancel a not emitted error after parsing const generic args

Browse Source
This commit is contained in:
Takayuki Maeda 2022-03-22 16:06:56 +09:00
parent 2d15732f6e
commit 62ded071d5
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_parse/src/parser/path.rs
View File

@ -630,10 +630,14 @@ impl<'a> Parser<'a> {
Ok(ty) => GenericArg::Type(ty), Ok(ty) => GenericArg::Type(ty),
Err(err) => { Err(err) => {
if is_const_fn { if is_const_fn {
if let Ok(expr) = (*snapshot).parse_expr_res(Restrictions::CONST_EXPR, None) match (*snapshot).parse_expr_res(Restrictions::CONST_EXPR, None) {
{ Ok(expr) => {
self.restore_snapshot(snapshot); self.restore_snapshot(snapshot);
return Ok(Some(self.dummy_const_arg_needs_braces(err, expr.span))); return Ok(Some(self.dummy_const_arg_needs_braces(err, expr.span)));
}
Err(err) => {
err.cancel();
}
} }
} }
// Try to recover from possible `const` arg without braces. // Try to recover from possible `const` arg without braces.

5
src/test/ui/const-generics/ice-const-generic-function-return-ty.rs Normal file
View File

@ -0,0 +1,5 @@
// #95163
fn return_ty() -> impl Into<<() as Reexported;
//~^ ERROR expected one of `(`, `::`, `<`, or `>`, found `;`
fn main() {}

8
src/test/ui/const-generics/ice-const-generic-function-return-ty.stderr Normal file
View File

@ -0,0 +1,8 @@
error: expected one of `(`, `::`, `<`, or `>`, found `;`
--> $DIR/ice-const-generic-function-return-ty.rs:2:46
|
LL | fn return_ty() -> impl Into<<() as Reexported;
| ^ expected one of `(`, `::`, `<`, or `>`
error: aborting due to previous error