Skip to content

Rollup of 7 pull requests - #64657

Closed
Centril wants to merge 18 commits into
rust-lang:masterfrom
Centril:rollup-m4h87vv
Closed

Rollup of 7 pull requests#64657
Centril wants to merge 18 commits into
rust-lang:masterfrom
Centril:rollup-m4h87vv

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

crgland others added 18 commits September 16, 2019 11:46
Sync to rust-lang/rust branch master
This would follow the same coding style as all the other match arms in this file.
It should be fine for Rust ABIs to involve any Rust type.
It was using the snippet from the "use" span, which often renders the
same, but with closures that snippet is on the start of the closure
where the value is captured. We should be using the snippet from the
span where it was moved into the `for` loop, which is `move_span`.
Document From trait for LhsExpr in parser
Add doc for From trait for converting P<Expr> and Option<ThinVec<Attribute>> to LhsExpr
As part of issue rust-lang#51430 (cc @skade).
Both of these should just be moving an address and setting a discriminant in an enum. The main thing I'm not sure about is whether it's worth documenting the branch in the From<Option<ThinVec<Attribute>>. As far as I can tell it doesn't seem like it is optimized away (although if the discriminant happened to work out you could just copy the pointer and the discriminant which might be cheaper, but that's not guaranteed). So it seems like if it's being called often, it's doubling the number of possible branch mispredictions on this Option, which could be a significant cost.
Let me know if there's anything that needs fixing and I'll get to it as soon as possible!
factor out pluralisation remains after rust-lang#64280
there are two case that doesn't not match the original macro pattern at [here](https://github.com/rust-lang/rust/blob/master/src/librustc_lint/unused.rs#L146) and [here](https://github.com/rust-lang/rust/blob/master/src/libsyntax/parse/diagnostics.rs#L539) as the provided param is already a bool or the check condition is not `x != 1`, so I change the macro accept a boolean expr instead of number to fit all the cases.
@Centril please review
Fixesrust-lang#64238.
remove the extra comma after the match arm
This would follow the same coding style as all the other match arms in this file.
Exempt extern "Rust" from improper_ctypes
It should be fine for Rust ABIs to involve any Rust type.
Fixesrust-lang#64593.
…rkor
Fix the span used to suggest avoiding for-loop moves
It was using the snippet from the "use" span, which often renders the
same, but with closures that snippet is on the start of the closure
where the value is captured. We should be using the snippet from the
span where it was moved into the `for` loop, which is `move_span`.
Fixesrust-lang#64559.
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=7 rollup=never

@bors

bors commented Sep 21, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 31b2f37 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 21, 2019
@bors

bors commented Sep 21, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 31b2f37 with merge 6c149fd525e35569884cf4f980211d5dd56d2a85...

@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors retry r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 21, 2019
@CentrilCentril closed this Sep 21, 2019
@Centril
Centril deleted the rollup-m4h87vv branch September 21, 2019 14:02
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Hint on missing tuple parens in pattern

7 participants

@Centril@bors@crgl@XAMPPRocky@n-salim@bpangWR@cuviper