Skip to content

Rollup of 7 pull requests #60416

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 14 commits into from
Apr 30, 2019
Merged

Rollup of 7 pull requests #60416

merged 14 commits into from
Apr 30, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 30, 2019

Successful merges:

Failed merges:

r? @ghost

Aaron1011 and 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.

Fixes rust-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.

Fixes rust-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#60365

rust-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)

Fixes rust-lang#59192

r? @matthewjasper
Add missing f16c_target_feature check to typeck collect
@Centril
Copy link
Contributor Author

Centril commented Apr 30, 2019

@bors r+ p=7

@bors
Copy link
Collaborator

bors commented Apr 30, 2019

📌 Commit 71a1b80 has been approved by Centril

@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 Apr 30, 2019
@bors
Copy link
Collaborator

bors commented Apr 30, 2019

⌛ 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
Copy link
Collaborator

bors commented Apr 30, 2019

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 30, 2019
@bors bors merged commit 71a1b80 into rust-lang:master Apr 30, 2019
@rust-highfive
Copy link
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
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

7 participants