Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 5 pull requests #69484

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

Merged
merged 19 commits into from
Feb 26, 2020
Merged

Rollup of 5 pull requests #69484

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
14999dd
Add methods to leak RefCell borrows to references
197g Jan 29, 2020
99b4357
Add tracking number, adjust documentation wording
197g Feb 12, 2020
bd12cd3
Formatter::sign is &'static str
Mark-Simulacrum Feb 15, 2020
6c45e45
Drop unused argument to float functions
Mark-Simulacrum Feb 15, 2020
34ef8f5
Move to using an extern type for opaqueness
Mark-Simulacrum Feb 15, 2020
f6bfdc9
Move the show_usize marker function to a static
Mark-Simulacrum Feb 16, 2020
03ca0e2
Allow getting `no_std` from the config file
Ericson2314 Feb 22, 2020
329022d
Address method comments
197g Feb 24, 2020
4dbdadf
rustc_metadata: Use binary search from standard library
petrochenkov Feb 24, 2020
245e15b
parse: extract `parse_stmt_item` & `parse_stmt_path_start`.
Centril Feb 23, 2020
32295ae
parse: simplify `parse_stmt_without_recovery`.
Centril Feb 23, 2020
1eb0844
parse: move condition into guard
Centril Feb 24, 2020
4f15867
bootstrap: Further centralize target defaulting logic.
Ericson2314 Feb 25, 2020
7876711
parse: address nitpick
Centril Feb 25, 2020
86b9377
Rollup merge of #68712 - HeroicKatora:finalize-ref-cell, r=dtolnay
Dylan-DPC Feb 26, 2020
e028f26
Rollup merge of #69209 - Mark-Simulacrum:strip-unsafe, r=dtolnay
Dylan-DPC Feb 26, 2020
d799f2d
Rollup merge of #69381 - QuiltOS:no-std-from-config, r=Mark-Simulacrum
Dylan-DPC Feb 26, 2020
c076027
Rollup merge of #69434 - petrochenkov:metabs, r=Mark-Simulacrum
Dylan-DPC Feb 26, 2020
ae383e2
Rollup merge of #69447 - Centril:minor-stmt-refactor, r=estebank
Dylan-DPC Feb 26, 2020
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
parse: address nitpick
  • Loading branch information
@Centril
Centril committed Feb 25, 2020
commit 7876711b9be1673631c4aaea63c289a984afbb0b
5 changes: 2 additions & 3 deletions src/librustc_parse/parser/stmt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,8 @@ impl<'a> Parser<'a> {
} else if let Some(item) = self.parse_stmt_item(attrs.clone())? {
// FIXME: Bad copy of attrs
self.mk_stmt(lo.to(item.span), StmtKind::Item(P(item)))
}
// Do not attempt to parse an expression if we're done here.
else if self.token == token::Semi {
} else if self.token == token::Semi {
// Do not attempt to parse an expression if we're done here.
self.error_outer_attrs(&attrs);
self.bump();
let mut last_semi = lo;
Expand Down