Skip to content

Rollup of 2 pull requests #83095

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

Rollup of 2 pull requests #83095

wants to merge 4 commits into from

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

@GuillaumeGomez
Prevent JS error when there is no dependency or other crate documented
56898ec
@GuillaumeGomez
crates.js should use root_path and not static_root_path
48a3bcd
@GuillaumeGomez
Rollup merge of rust-lang#83028 - GuillaumeGomez:prevent-js-error-if-…
2b438a0 
…no-filter, r=Nemo157

Prevent JS error when there is no dependency or other crate documented (or --disable-per-crate-search has been used)

When there is only one crate, the dropdown is removed, creating an error (that you can see pretty easily on docs.rs for example).

r? `@jyn514`
@GuillaumeGomez
Rollup merge of rust-lang#83094 - GuillaumeGomez:crates-js-location, …
36628ff 
…r=Nemo157

crates.js should use root_path and not static_root_path

r? `@Nemo157`
@rustbot rustbot added the rollup A PR which is a rollup label Mar 13, 2021
@GuillaumeGomez
Copy link
Member Author

Exceptionally, I'm making a rollup with only two PRs because they fix bugs currently running on docs.rs.

@bors: r+ p=5

@bors
Copy link
Collaborator

bors commented Mar 13, 2021

📌 Commit 36628ff has been approved by GuillaumeGomez

@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 Mar 13, 2021
@Dylan-DPC-zz
Copy link

superseded by a bigger rollup :P

@Dylan-DPC-zz
Copy link

@bors r-

@Dylan-DPC-zz Dylan-DPC-zz reopened this Mar 13, 2021
@Dylan-DPC-zz
Copy link

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 13, 2021
@GuillaumeGomez GuillaumeGomez deleted the rollup-l4ny5te branch March 13, 2021 22:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@GuillaumeGomez @bors @Dylan-DPC-zz @rustbot