Htmldocck: Substitute the doc channel when blessing#99766
Merged
bors merged 1 commit intorust-lang:masterfrom Jul 29, 2022
Merged
Htmldocck: Substitute the doc channel when blessing#99766bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
rustbot
added
the
T-rustdoc
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rustbot
added
the
A-testsuite
rust-highfive
added
the
S-waiting-on-review
camelid
reviewed
Jul 27, 2022
Member
|
I think this matches what compiletest does with normalization, so it seems OK to me. If we run into trouble we should definitely improve this check, though, rather than manually fixing things -- thank you for filing the PR! @bors r+ |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 29, 2022
Rollup of 8 pull requests Successful merges: - rust-lang#99686 (add suggestion when there is a impl of external trait on pointer with wrong coherence rules) - rust-lang#99760 (doc/rustc: describe the uefi target platforms) - rust-lang#99766 (Htmldocck: Substitute the doc channel when blessing) - rust-lang#99781 (Use String::from_utf8_lossy in CStr demo) - rust-lang#99803 (Update mentions to `rustc_metadata::rmeta::Lazy`) - rust-lang#99845 (Remove `$` prefix for bash scripts in doc) - rust-lang#99850 (rustdoc: Remove more Clean trait implementations) - rust-lang#99872 (Clone the `src/llvm-project` submodule if profiling is enabled) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Since #84942, the snippet
{{channel}}gets substituted with the concrete “doc channel” (e.g.https://doc.rust-lang.org/nightly) when snapshot files are checked against the actual rustdoc output.However, when you
--blessrustdoc tests, htmldocck just dumps the concrete channel into the snapshot file andyou have to manually do a find-and-replace after blessing to uphold what #84942 set out to fix.
I admit it's a bit fragile to blindly replace URLs like this but I guess it's not too bad in practice.
Feel free to close this PR if you don't think that this is a good idea.
@rustbot label T-rustdoc A-testsuite