Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes reflecting the new placeholder system for stabilizations #643

Merged
merged 1 commit into from
Aug 28, 2022

Conversation

est31
Copy link
Member

@est31 est31 commented Aug 23, 2022

Due to rust-lang/rust#100591

There are a few changes in the release process and how changes are backported to beta, mostly around running ./x.py run replace-version-placeholder at specific points. This PR updates the document so that it is followed for future releases.

@est31 est31 changed the title Changes reflecting the new placeholder policy for stabilizations Changes reflecting the new placeholder system for stabilizations Aug 23, 2022
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks right to me, but would appreciate a review from @Mark-Simulacrum to confirm. also, same comment as rust-lang/std-dev-guide#43, this should wait until your PR is actually merged.

cc @rust-lang/release , the release process is changing.

@Mark-Simulacrum
Copy link
Member

Will review as part of rust-lang/rust#100591.

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 27, 2022
…ark-Simulacrum

Require stabilizations to use a placeholder instead of writing out stabilization version

Implements the idea from [this](https://rust-lang.zulipchat.com/#narrow/stream/241545-t-release/topic/libs.20stabilization.20placeholder) zulip stream.

It's a common phenomenon that feature stabilizations don't make it into a particular release, but the version is still inaccurate. Often this is caught in the PR, but it can also require subsequent changes to adjust/correct the version. A list with examples of such PRs is given in rust-lang#100577, but it's far from complete.

This PR requires stabilization PRs to use the placeholder `CURRENT_RUSTC_VERSION`, enforced via tidy tooling. The PR also adds a tool that replaces the placeholder with the version number. It can be invoked via `./x.py run src/tools/replace-version-placeholder` and is supposed to be ran upon beta branching as well as version bumping and any backports to the beta branch.  I filed PRs to the dev guide and forge to document these changes in the release and stabilization workflows:

* The [dev guide](https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#determining-the-stabilization-version) PR: rust-lang/rustc-dev-guide#1443
* The [std dev guide](https://std-dev-guide.rust-lang.org/) PR: rust-lang/std-dev-guide#43
* The [forge](https://github.com/rust-lang/rust-forge) PR: rust-lang/rust-forge#643

Alternative to rust-lang#100577 which added checking.
@Mark-Simulacrum Mark-Simulacrum merged commit a32d8f2 into rust-lang:master Aug 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants