Skip to content

Rollup of 7 pull requests #87719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

Rollup of 7 pull requests #87719

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1280423
Properly find owner of closure in THIR unsafeck
LeSeulArtichaut Jul 30, 2021
d2d8519
Fix a parser ICE on invalid `fn` body
JohnTitor Jul 30, 2021
e0172b3
Write docs for SyncOnceCell From and Default impl
notriddle Aug 1, 2021
28382ff
:arrow_up: rust-analyzer
lnicola Aug 2, 2021
a43c464
Add `aarch64-apple-ios-sim` as a possible target to the manifest
badboy Aug 2, 2021
a5cdff3
Add convenience for handling ipv4-mapped addresses by canonicalizing …
the8472 Aug 2, 2021
b23de51
Allow generic SIMD array element type
calebzulawski Aug 3, 2021
f865d94
Rollup merge of #87645 - LeSeulArtichaut:issue-87414, r=oli-obk
JohnTitor Aug 3, 2021
9b3f2b2
Rollup merge of #87646 - JohnTitor:fix-parser-ice, r=oli-obk
JohnTitor Aug 3, 2021
72afbab
Rollup merge of #87685 - notriddle:lazy-from-docs, r=dtolnay
JohnTitor Aug 3, 2021
ecad01e
Rollup merge of #87691 - lnicola:rust-analyzer-2021-08-02, r=lnicola
JohnTitor Aug 3, 2021
1eb2b07
Rollup merge of #87693 - badboy:enable-ios-sim-target-manifest, r=Mar…
JohnTitor Aug 3, 2021
020dc16
Rollup merge of #87708 - the8472:canonical_v6, r=dtolnay
JohnTitor Aug 3, 2021
5b4fb04
Rollup merge of #87716 - calebzulawski:master, r=workingjubilee
JohnTitor Aug 3, 2021
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
Prev Previous commit
Next Next commit
Fix a parser ICE on invalid fn body
  • Loading branch information
@JohnTitor
JohnTitor committed Jul 30, 2021
commit d2d851949bab4c96b54d11126a0efd1826557d3f
4 changes: 1 addition & 3 deletions compiler/rustc_parse/src/parser/item.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1715,13 +1715,11 @@ impl<'a> Parser<'a> {
// the AST for typechecking.
err.span_label(ident.span, "while parsing this `fn`");
err.emit();
(Vec::new(), None)
} else {
return Err(err);
}
} else {
unreachable!()
}
(Vec::new(), None)
};
attrs.extend(inner_attrs);
Ok(body)
Expand Down
9 changes: 9 additions & 0 deletions src/test/ui/parser/issue-87635.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
struct Foo {}

impl Foo {
pub fn bar()
//~^ ERROR: expected `;`, found `}`
//~| ERROR: associated function in `impl` without body
}

fn main() {}
19 changes: 19 additions & 0 deletions src/test/ui/parser/issue-87635.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
error: expected `;`, found `}`
--> $DIR/issue-87635.rs:4:17
|
LL | pub fn bar()
| ^ help: add `;` here
...
LL | }
| - unexpected token

error: associated function in `impl` without body
--> $DIR/issue-87635.rs:4:5
|
LL | pub fn bar()
| ^^^^^^^^^^^-
| |
| help: provide a definition for the function: `{ <body> }`

error: aborting due to 2 previous errors