Move back templates into html folder#93005
Merged
bors merged 1 commit intorust-lang:masterfrom Jan 20, 2022
Merged
Conversation
rustbot
added
the
T-rustdoc
Collaborator
|
☔ The latest upstream changes (presumably #93021) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
the
S-waiting-on-author
GuillaumeGomez
force-pushed
the
templates-in-html
branch
from
e301017 to
a235887
Compare
notriddle
approved these changes
Jan 18, 2022
Member
Author
|
You have r+ rights now normally. Give it a try! :D |
Contributor
|
Okay, bors r+ |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit a23588702273e05ff2f29bfe80ff88cb857ff3e7 has been approved by |
bors
added
S-waiting-on-bors
Member
Author
|
🎉 |
Collaborator
|
☔ The latest upstream changes (presumably #93048) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
GuillaumeGomez
force-pushed
the
templates-in-html
branch
from
a235887 to
48f5dca
Compare
Member
Author
|
Rebased... It's very conflict-prone so I'll raise its a priority a bit. @bors: r=notriddle p=1 |
Collaborator
|
📌 Commit 48f5dca has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 19, 2022
…askrgr Rollup of 6 pull requests Successful merges: - rust-lang#92316 (mangling_v0: Skip extern blocks during mangling) - rust-lang#92630 (Change PhantomData type for `BuildHasherDefault` (and more)) - rust-lang#92800 (Add manifest docs fallback.) - rust-lang#93005 (Move back templates into html folder) - rust-lang#93065 (Pretty printer algorithm revamp step 2) - rust-lang#93077 (remove `List::is_noop`) Failed merges: - rust-lang#93068 (Fix spacing for `·` between stability and source) r? `@ghost` `@rustbot` modify labels: rollup
Collaborator
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
4 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.
Follow-up of #92526.
r? @notriddle