Skip to content

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. A-rustdoc-ui Area: Rustdoc UI (generated HTML) labels Mar 13, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 13, 2021
@Nemo157
Copy link
Member

Nemo157 commented Mar 13, 2021

@bors r+

For posterity, this is the fix for rust-lang/docs.rs#1300 and rust-lang/docs.rs#1313; the crates.js isn't a static file that docs.rs can share between all builds for a nightly, it depends on the crates in the build.

@bors
Copy link
Collaborator

bors commented Mar 13, 2021

📌 Commit 48a3bcd has been approved by Nemo157

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 13, 2021
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Mar 13, 2021
…r=Nemo157

crates.js should use root_path and not static_root_path

r? `@Nemo157`
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 13, 2021
…r=Nemo157

crates.js should use root_path and not static_root_path

r? ``@Nemo157``
@Dylan-DPC-zz
Copy link

@bors p=1 rollup=never

@bors
Copy link
Collaborator

bors commented Mar 14, 2021

⌛ Testing commit 48a3bcd with merge f293f70...

@bors
Copy link
Collaborator

bors commented Mar 14, 2021

☀️ Test successful - checks-actions
Approved by: Nemo157
Pushing f293f70 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 14, 2021
@bors bors merged commit f293f70 into rust-lang:master Mar 14, 2021
@rustbot rustbot added this to the 1.52.0 milestone Mar 14, 2021
@GuillaumeGomez GuillaumeGomez deleted the crates-js-location branch March 14, 2021 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-ui Area: Rustdoc UI (generated HTML) merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants