Skip to content

crates.js should use root_path and not static_root_path - #83094

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:crates-js-location
Mar 14, 2021
Merged

crates.js should use root_path and not static_root_path#83094
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:crates-js-location

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Mar 13, 2021

Copy link
Copy Markdown
Member

@GuillaumeGomezGuillaumeGomez 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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 13, 2021
@Nemo157

Nemo157 commented Mar 13, 2021

Copy link
Copy Markdown
Contributor

@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

bors commented Mar 13, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 48a3bcd has been approved by Nemo157

@borsbors 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
@Nemo157Nemo157 mentioned this pull request Mar 13, 2021
Merged
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Mar 13, 2021
@GuillaumeGomez
Rollup merge ofrust-lang#83094- GuillaumeGomez:crates-js-location, …
36628ff
…r=Nemo157
crates.js should use root_path and not static_root_path
r? `@Nemo157`
@GuillaumeGomezGuillaumeGomez mentioned this pull request Mar 13, 2021
Closed
@jyn514jyn514 mentioned this pull request Mar 13, 2021
Merged
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 13, 2021
@Dylan-DPC
Rollup merge ofrust-lang#83094- GuillaumeGomez:crates-js-location, …
2ca9afc
…r=Nemo157
crates.js should use root_path and not static_root_path
r? ``@Nemo157``
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Mar 13, 2021
Closed
@Dylan-DPC-zz

Dylan-DPC-zz commented Mar 13, 2021

Copy link
Copy Markdown

@bors p=1 rollup=never

@bors

bors commented Mar 14, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 48a3bcd with merge f293f70...

@bors

bors commented Mar 14, 2021

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Mar 14, 2021
@bors
bors merged commit f293f70 into rust-lang:masterMar 14, 2021
@rustbotrustbot added this to the 1.52.0 milestone Mar 14, 2021
@GuillaumeGomez
GuillaumeGomez deleted the crates-js-location branch March 14, 2021 12:56
@jshajsha mentioned this pull request Sep 29, 2022
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Nemo157Nemo157

Labels

A-rustdoc-uiArea: Rustdoc UI (generated HTML)merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.52.0

Development

Successfully merging this pull request may close these issues.

6 participants

@GuillaumeGomez@Nemo157@bors@Dylan-DPC-zz@rust-highfive@rustbot