Skip to content
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

Jump to bottom

Rollup of 5 pull requests #88890

Closed
wants to merge 20 commits into from
Closed

Rollup of 5 pull requests #88890

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
efeb461
Make `UnsafeCell::get_mut` const
WaffleLapkin Sep 7, 2021
5eb84b2
Update cargo
ehuss Sep 8, 2021
83875ea
Prep for upgrade to cargo_metadata 0.14.0
smoelius Sep 1, 2021
a628223
Update dependencies
smoelius Sep 9, 2021
bd4b17a
Update lockfile
smoelius Sep 9, 2021
2691a39
Revert "Allow formatting `Anonymous{Struct, Union}` declarations"
pnkfelix Sep 8, 2021
2041fb1
Revert "Add test for pretty printing anonymous types"
pnkfelix Sep 8, 2021
5560f6d
Revert "Fix ast expanded printing for anonymous types"
pnkfelix Sep 8, 2021
f38ec9c
Revert "Add test for restriction of anonymous types on validation"
pnkfelix Sep 8, 2021
b6aa7e3
Manually crafted revert of d4ad050ce5778a09566f6f9ec172565815d54604 .
pnkfelix Sep 8, 2021
91feb76
Revert "Implement Anonymous{Struct, Union} in the AST"
pnkfelix Sep 8, 2021
f26f1ed
Re-add 71a7f8f1884b2c83eeb4a545eef16df1f2ea6476 post-revert.
pnkfelix Sep 8, 2021
35370a7
regression test for issue #88583.
pnkfelix Sep 9, 2021
eaa6461
add rustc option for using LLVM stack smash protection
bbjornse Apr 6, 2021
2c30162
Fill in the tracking issue for `#![feature(const_unsafecell_get_mut)]`
WaffleLapkin Sep 10, 2021
b78cdfc
Rollup merge of #84197 - bbjornse:stack-protector, r=nikic
Manishearth Sep 12, 2021
0604a99
Rollup merge of #88517 - smoelius:without-patch-versions, r=flip1995
Manishearth Sep 12, 2021
1a91d57
Rollup merge of #88722 - WaffleLapkin:unsafe_cell_const_get_mut, r=dt…
Manishearth Sep 12, 2021
11a4efc
Rollup merge of #88766 - ehuss:update-cargo, r=ehuss
Manishearth Sep 12, 2021
c09e12b
Rollup merge of #88775 - pnkfelix:revert-anon-union-parsing, r=davidtwco
Manishearth Sep 12, 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
Re-add 71a7f8f post-revert.
  • Loading branch information
@pnkfelix
pnkfelix committed Sep 9, 2021
commit f26f1ed9a7208c0d928f0413cdd5f0966fa2c399
5 changes: 4 additions & 1 deletion compiler/rustc_parse/src/parser/item.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1469,7 +1469,10 @@ impl<'a> Parser<'a> {
let (ident, is_raw) = self.ident_or_err()?;
if !is_raw && ident.is_reserved() {
let err = if self.check_fn_front_matter(false) {
let _ = self.parse_fn(&mut Vec::new(), |_| true, lo);
// We use `parse_fn` to get a span for the function
if let Err(mut db) = self.parse_fn(&mut Vec::new(), |_| true, lo) {
db.delay_as_bug();
}
let mut err = self.struct_span_err(
lo.to(self.prev_token.span),
&format!("functions are not allowed in {} definitions", adt_ty),
Expand Down