Skip to content

Rollup of 4 pull requests - #60389

Merged
bors merged 12 commits into
rust-lang:masterfrom
Centril:rollup-nefreyr
Apr 30, 2019
Merged

Rollup of 4 pull requests#60389
bors merged 12 commits into
rust-lang:masterfrom
Centril:rollup-nefreyr

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

matthewjasperand others added 12 commits April 26, 2019 21:35
…r=estebank
Cleanup the MIR visitor
* Remove useless `BasicBlock` parameters on methods with `Location`s.
* Prefer `visit_terminator_kind` to `visit_terminator`.
* Remove `Region` from PlaceContexts. `visit_rvalue` should be used when the region is important.
* Remove unused visitor methods.
…lay, r=Manishearth
Fix line number display in source view
Fixesrust-lang#60310.
r? rust-lang/rustdoc
cc @Manishearth
screenshot of the fix:
<img width="798" alt="Screenshot 2019-04-29 at 23 12 20" src="https://user-images.githubusercontent.com/3050060/56927541-b7286680-6ad4-11e9-9215-42dc4ef42691.png">
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=4

@bors

bors commented Apr 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 116dcff 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 Apr 30, 2019
@bors

bors commented Apr 30, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 116dcff with merge f843ad6...

bors added a commit that referenced this pull request Apr 30, 2019
Rollup of 4 pull requests
Successful merges:
- #59869 (SGX target: implemented vectored I/O)
- #60238 (Update rustfmt to 1.2.2)
- #60276 (Cleanup the MIR visitor)
- #60380 (Fix line number display in source view)
Failed merges:
r? @ghost
@bors

bors commented Apr 30, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing f843ad6 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Apr 30, 2019
@bors
bors merged commit 116dcff into rust-lang:masterApr 30, 2019
@rust-highfive

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #60389!

Tested on commit f843ad6.
Direct link to PR: #60389

💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
💔 rls on windows: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 30, 2019
Tested on commit rust-lang/rust@f843ad6.
Direct link to PR: <rust-lang/rust#60389>
💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
💔 rls on windows: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @Xanewok, @rust-lang/infra).
@Centril
Centril deleted the rollup-nefreyr branch April 30, 2019 05:17
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

6 participants

@Centril@bors@rust-highfive@matthewjasper@topecongiro@GuillaumeGomez