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.

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

Rollup of 12 pull requests #55502

Merged
merged 30 commits into from
Oct 30, 2018
Merged

Rollup of 12 pull requests #55502

merged 30 commits into from
Oct 30, 2018

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Oct 30, 2018

Successful merges:

Failed merges:

r? @ghost

japaric and others added 30 commits October 28, 2018 19:03
PR rust-lang#51953 enabled the Atomic*.{load,store} API on MSP430. Unfortunately, the
LLVM backend doesn't currently support those atomic operations, so this commit
removes the API and leaves instructions on how and when to enable it in the
future.
Don't lint 'unused_parens` on `if (break _) { .. }`

This fixes rust-lang#54704
…ion, r=estebank

Improve a few cases of collecting to an FxHash(Map/Set)

Either use `collect` or procure specified capacity when possible.
msp430: remove the whole Atomic* API

PR rust-lang#51953 enabled the Atomic*.{load,store} API on MSP430. Unfortunately,
the LLVM backend doesn't currently support those atomic operations, so this
commit removes the API and leaves instructions on how and when to enable it
in the future.

the second fixes compiling liballoc for msp430

closes rust-lang#54511
r? @alexcrichton
cc @chernomor @awygle @cr1901 @pftbest
Use opt.take() instead of mem::replace(opt, None)

It's easier to read.
…impl_iterator, r=estebank

Take advantage of impl Iterator in (transitive/elaborate)_bounds

Other than for `debug!`ging purposes, `bounds` are only iterated over, so they don't need to be collected into vectors.
…amertj

Change a flat_map with 0/1-element vecs to a filter_map

No need to use vectors in this case - `Option`s are quite sufficient.
Adjust Ids of path segments in visibility modifiers

Fixes rust-lang#55376 (nightly regression)

r? @petrochenkov
…isdreavus

Doc fixes

Fixes the bug in source code page where code was below line numbers and fixed this bug too ("Expand description" is shown whereas it shouldn't):

<img width="1440" alt="screenshot 2018-10-29 at 23 11 29" src="https://user-images.githubusercontent.com/3050060/47684136-1105ad80-dbd2-11e8-9e9f-fb7f26b0f5bd.png">

r? @QuietMisdreavus
…te-must-look-at-parents-of-closures, r=davidtwco

borrowck=migrate must look at parents of closures

This fixes the NLL migration mode (which is the default with edition=2018) to inspect all parents of a closure in addition to the closure itself when looking to see if AST-borrowck issues an error for the given code.

This should be a candidate for beta backport.

Fix rust-lang#55492
@kennytm
Copy link
Member Author

kennytm commented Oct 30, 2018

@bors r+ p=12

@bors
Copy link
Contributor

bors commented Oct 30, 2018

📌 Commit c16ff6e has been approved by kennytm

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 30, 2018
@bors
Copy link
Contributor

bors commented Oct 30, 2018

⌛ Testing commit c16ff6e with merge e8aef7c...

bors added a commit that referenced this pull request Oct 30, 2018
Rollup of 12 pull requests

Successful merges:

 - #54885 (Don't lint 'unused_parens` on `if (break _) { .. }`)
 - #55205 (Improve a few cases of collecting to an FxHash(Map/Set))
 - #55450 (msp430: remove the whole Atomic* API)
 - #55459 (Add UI test for #49296)
 - #55472 (Use opt.take() instead of mem::replace(opt, None))
 - #55473 (Take advantage of impl Iterator in (transitive/elaborate)_bounds)
 - #55474 (Fix validation false positive)
 - #55476 (Change a flat_map with 0/1-element vecs to a filter_map)
 - #55487 (Adjust Ids of path segments in visibility modifiers)
 - #55493 (Doc fixes)
 - #55494 (borrowck=migrate must look at parents of closures)
 - #55496 (Update clippy)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 30, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing e8aef7c to master...

@bors bors merged commit c16ff6e into rust-lang:master Oct 30, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #55502!

Tested on commit e8aef7c.
Direct link to PR: #55502

🎉 clippy-driver on windows: build-fail → test-pass.
🎉 clippy-driver on linux: build-fail → test-pass.
🎉 rls on windows: build-fail → test-fail.
🎉 rls on linux: build-fail → test-fail.

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 30, 2018
Tested on commit rust-lang/rust@e8aef7c.
Direct link to PR: <rust-lang/rust#55502>

🎉 clippy-driver on windows: build-fail → test-pass.
🎉 clippy-driver on linux: build-fail → test-pass.
🎉 rls on windows: build-fail → test-fail.
🎉 rls on linux: build-fail → test-fail.
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.