Skip to content

Rollup of 6 pull requests - #60007

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

Rollup of 6 pull requests#60007
bors merged 14 commits into
rust-lang:masterfrom
Centril:rollup-gdh1er4

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Unreachableand others added 14 commits April 5, 2019 03:05
improve docs for std::hint::unreachable_unchecked()
Fixesrust-lang#59549
…umeGomez
Fix rustdoc sidebar z-index
I think the screenshot will say everything:
![image](https://user-images.githubusercontent.com/2884517/56098429-37fa3680-5f09-11e9-8c54-4e2548aa0818.png)
live example: https://docs.rs/nom/4.2.3/nom/
I chose the smallest z-index to avoid problems with other blocks.
…h, r=GuillaumeGomez
rustdoc: use --static-root-path for settings.js
At the time i was writing rust-lang/docs.rs#332, i noticed that the `settings.js` file that was being loaded was not being loaded from the `--static-root-path`. This PR fixes that so that users on docs.rs can effectively cache this file.
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=6

@bors

bors commented Apr 16, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 67ff8cf 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 16, 2019
@bors

bors commented Apr 16, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 67ff8cf with merge a7cef0b...

bors added a commit that referenced this pull request Apr 16, 2019
Rollup of 6 pull requests
Successful merges:
- #59717 (improve docs for std::hint::unreachable_unchecked())
- #59903 (Continue evaluating after missing main)
- #59973 (Fix rustdoc sidebar z-index)
- #59992 (rustdoc: use --static-root-path for settings.js)
- #59993 (include mode in unused binding suggestion span)
- #60000 (Add repo-specific triagebot configuration)
Failed merges:
r? @ghost
@bors

bors commented Apr 16, 2019

Copy link
Copy Markdown
Collaborator

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

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

Copy link
Copy Markdown
Contributor

📣 Toolstate changed by #60007!

Tested on commit a7cef0b.
Direct link to PR: #60007

🎉 rls on windows: test-fail → test-pass (cc @nrc@Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 16, 2019
Tested on commit rust-lang/rust@a7cef0b.
Direct link to PR: <rust-lang/rust#60007>
🎉 rls on windows: test-fail → test-pass (cc @nrc@Xanewok, @rust-lang/infra).
@Centril
Centril deleted the rollup-gdh1er4 branch April 16, 2019 08:35
@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.

8 participants

@Centril@bors@rust-highfive@estebank@Enity@QuietMisdreavus@euclio@emilyalbini