Skip to content

Rollup of 7 pull requests - #60416

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

Rollup of 7 pull requests#60416
bors merged 14 commits into
rust-lang:masterfrom
Centril:rollup-bbyyz9x

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Aaron1011and others added 14 commits April 27, 2019 20:33
Previously, we checked if the target of a projection type was itself an
inference variable. However, for Rustdoc rendering purposes, there's no
distinction between an inference variable ('_') and a type containing
one (e.g. (MyStruct<u8, _>)) - we don't want to render either of them.
Fixesrust-lang#60269
Due to the complexity of the original bug, which spans three different
crates (hyper, tower-hyper, and tower), I have been unable to create a
minimized reproduction for the issue.
Don't try to render auto-trait bounds with any inference variables
Previously, we checked if the target of a projection type was itself an
inference variable. However, for Rustdoc rendering purposes, there's no
distinction between an inference variable ('_') and a type containing
one (e.g. (MyStruct<u8, _>)) - we don't want to render either of them.
Fixesrust-lang#60269
Due to the complexity of the original bug, which spans three different
crates (hyper, tower-hyper, and tower), I have been unable to create a
minimized reproduction for the issue.
…cepted, r=oli-obk
Cleanup declare_features! for 'accepted' with a uniform style + sort them
r? @oli-obk
cc rust-lang#60362
cc rust-lang#60361
…tive, r=oli-obk
Cleanup 'active' declare_features! with uniform style + sorting.
r? @oli-obk
(added the FIXME you wanted)
cc rust-lang#60354
cc rust-lang#60361
…llaumeGomez
Revert "Update Source Code Pro fonts to version 2.030"
Temporary fix for rust-lang#60365rust-lang#60146 updated all fonts (not just the fonts that were buggy), however it looks like the new Source Code Pro is buggy.
We should test this out of tree: `cargo doc` on anything, replace the font in `target/doc`, and use `python -m SimpleHTTPServer` to see what's going on.
Till we figure that out, I'll just back this out.
r? @GuillaumeGomez
This reverts commit 6bafc58.
…ewjasper
Remove functions to simplify handling of feature(bind_by_move_pattern_guards)
Fixesrust-lang#59192
r? @matthewjasper
Add missing f16c_target_feature check to typeck collect
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=7

@bors

bors commented Apr 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 71a1b80 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 71a1b80 with merge 5b7baa5...

bors added a commit that referenced this pull request Apr 30, 2019
Rollup of 7 pull requests
Successful merges:
- #60344 (Don't try to render auto-trait bounds with any inference variables)
- #60354 (Cleanup declare_features! for 'accepted' with a uniform style + sort them)
- #60362 (Cleanup 'active' declare_features! with uniform style + sorting.)
- #60382 (Revert "Update Source Code Pro fonts to version 2.030")
- #60399 (Update clippy)
- #60400 (Remove functions to simplify handling of feature(bind_by_move_pattern_guards))
- #60408 (Add missing f16c_target_feature check to typeck collect)
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 5b7baa5 to master...

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

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #60416!

Tested on commit 5b7baa5.
Direct link to PR: #60416

🎉 clippy-driver on windows: build-fail → test-pass (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
🎉 rls on windows: build-fail → test-fail (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-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@5b7baa5.
Direct link to PR: <rust-lang/rust#60416>
🎉 clippy-driver on windows: build-fail → test-pass (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
🎉 clippy-driver on linux: build-fail → test-pass (cc @Manishearth@llogiq@mcarton@oli-obk@phansch, @rust-lang/infra).
🎉 rls on windows: build-fail → test-fail (cc @Xanewok, @rust-lang/infra).
🎉 rls on linux: build-fail → test-fail (cc @Xanewok, @rust-lang/infra).
@Centril
Centril deleted the rollup-bbyyz9x branch April 30, 2019 18:10
@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.

7 participants

@Centril@bors@rust-highfive@Aaron1011@Manishearth@JohnTitor@gnzlbg