Add missing suffix for sidebar-items script path #92742
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
the
T-rustdoc
|
r? @notriddle |
notriddle
approved these changes
Jan 10, 2022
camelid
added
the
S-waiting-on-review
syphar
reviewed
Jan 11, 2022
| @@ -665,7 +665,7 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> { | |||
| _ => unreachable!(), | |||
| }; | |||
| let items = self.build_sidebar_items(module); | |||
| let js_dst = self.dst.join("sidebar-items.js"); | |||
| let js_dst = self.dst.join(&format!("sidebar-items{}.js", self.shared.resource_suffix)); | |||
There was a problem hiding this comment.
@GuillaumeGomez just a thought:
docs.rs is using static file categorization like this:
let mut rustdoc_flags = vec
There was a problem hiding this comment.
sidebar-items isn't a shared resource, or even invocation-specific. It's actually per-module. These URLs all exist, and all have different contents:
- https://doc.rust-lang.org/stable/alloc/sync/sidebar-items.js
- https://doc.rust-lang.org/stable/alloc/sidebar-items.js
- https://doc.rust-lang.org/stable/core/sidebar-items.js
In contrast, search-index is here:
There was a problem hiding this comment.
Just like @notriddle said. ;)
There was a problem hiding this comment.
thanks for the explanation!
So as I understand it these are invocation-specific, and when they are different they will be in different paths inside the docs.
|
Thanks for the quick review @notriddle! @bors: r+ rollup |
|
📌 Commit 881b427 has been approved by |
bors
added
S-waiting-on-bors
|
Force of habit... @bors: r=notriddle |
|
💡 This pull request was already approved, no need to approve it again.
|
|
📌 Commit 881b427 has been approved by |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 11, 2022
…ar-items, r=notriddle Add missing suffix for sidebar-items script path Fixes rust-lang/docs.rs#1590. r? `@syphar`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 11, 2022
…ar-items, r=notriddle Add missing suffix for sidebar-items script path Fixes rust-lang/docs.rs#1590. r? ``@syphar``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 12, 2022
…askrgr Rollup of 14 pull requests Successful merges: - rust-lang#92328 (Tweak sentence in `transmute` docs) - rust-lang#92432 (Error when selected impl is not const in constck) - rust-lang#92506 (Document Box<T> FFI guarantee in 1.41.0 release notes) - rust-lang#92699 (rustdoc: Display "private fields" instead of "fields omitted") - rust-lang#92703 (RELEASES.md: Add 1.58 release note for `File::options` stabilization) - rust-lang#92707 (Extended the note on the use of `no_run` attribute) - rust-lang#92709 (Improve documentation for File::options to give a more likely example) - rust-lang#92720 (Fix doc formatting for time.rs) - rust-lang#92732 (Add note about upstream commit musl-patch-configure.diff is derived from) - rust-lang#92742 (Add missing suffix for sidebar-items script path) - rust-lang#92748 (Eliminate "boxed" wording in `std::error::Error` documentation) - rust-lang#92754 (Update AsmArgs field visibility for rustfmt) - rust-lang#92756 (:arrow_up: rust-analyzer) - rust-lang#92764 (Fix rust logo style) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes rust-lang/docs.rs#1590.
r? @syphar