Skip to content

Include rustc and rustdoc book in replace-version-placeholder - #135221

Merged
bors merged 1 commit into
rust-lang:masterfrom
Urgau:replace-in-stable-book
Jan 9, 2025
Merged

Include rustc and rustdoc book in replace-version-placeholder#135221
bors merged 1 commit into
rust-lang:masterfrom
Urgau:replace-in-stable-book

Conversation

@Urgau

@UrgauUrgau commented Jan 7, 2025

Copy link
Copy Markdown
Member

This PR includes the (stable) rustc and rustdoc books which might contain CURRENT_RUSTC_VERSION that should be replaced when branching beta. Include them so they are not forgotten.

I didn't include any other folder or books as they don't strike me as relevant for it and might be problematic in the future if some of the submodules are turned into subtree, because we have places where we wouldn't want to replace them.

cf. #135163 (comment)
cc @pietroalbini

@rustbot

Copy link
Copy Markdown
Collaborator

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbotrustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 7, 2025
@jieyouxu

Copy link
Copy Markdown
Member

cc @rust-lang/rustdoc

@GuillaumeGomez

Copy link
Copy Markdown
Member

Sounds good to me.

@emilyalbini

Copy link
Copy Markdown
Member

r? @pietroalbini
@bors r+

@bors

bors commented Jan 8, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit eadb76e has been approved by pietroalbini

It is now in the queue for this repository.

@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 Jan 8, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 9, 2025
…iaskrgr
Rollup of 6 pull requests
Successful merges:
- rust-lang#128110 (Suggest Replacing Comma with Semicolon in Incorrect Repeat Expressions)
- rust-lang#134609 (Add new `{x86_64,i686}-win7-windows-gnu` targets)
- rust-lang#134875 (Implement `const Destruct` in old solver)
- rust-lang#135221 (Include rustc and rustdoc book in replace-version-placeholder)
- rust-lang#135231 (bootstrap: Add more comments to some of the test steps)
- rust-lang#135256 (Move `mod cargo` below the import statements)
Failed merges:
- rust-lang#135195 (Make `lit_to_mir_constant` and `lit_to_const` infallible)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 29c17fc into rust-lang:masterJan 9, 2025
@rustbotrustbot added this to the 1.86.0 milestone Jan 9, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 9, 2025
Rollup merge of rust-lang#135221 - Urgau:replace-in-stable-book, r=pietroalbini
Include rustc and rustdoc book in replace-version-placeholder
This PR includes the *(stable)* rustc and rustdoc books which might contain `CURRENT_RUSTC_VERSION` that should be replaced when branching beta. Include them so they are not forgotten.
I didn't include any other folder or books as they don't strike me as relevant for it and might be problematic in the future if some of the submodules are turned into subtree, because we have places where we wouldn't want to replace them.
cf. rust-lang#135163 (comment)
cc `@pietroalbini`
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@Urgau@rustbot@jieyouxu@GuillaumeGomez@emilyalbini@bors@Mark-Simulacrum