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

replace-version-placeholder should not recurse into the rustc-dev-guide #102014

Closed
pietroalbini opened this issue Sep 19, 2022 · 3 comments · Fixed by #102017
Closed

replace-version-placeholder should not recurse into the rustc-dev-guide #102014

pietroalbini opened this issue Sep 19, 2022 · 3 comments · Fixed by #102017
Labels
C-bug Category: This is a bug. T-release Relevant to the release subteam, which will review and decide on the PR/issue.

Comments

@pietroalbini
Copy link
Member

Right now, running ./x run replace-version-placeholder causes among other things this unwanted diff:

diff --git a/src/doc/rustc-dev-guide/src/stabilization_guide.md b/src/doc/rustc-dev-guide/src/stabilization_guide.md
index 0ac1929..188faa8 100644
--- a/src/doc/rustc-dev-guide/src/stabilization_guide.md
+++ b/src/doc/rustc-dev-guide/src/stabilization_guide.md
@@ -109,7 +109,7 @@ to stabilize, something like (this example is taken from
 
 ```rust,ignore
 // pub(restricted) visibilities (RFC 1422)
-(active, pub_restricted, "CURRENT_RUSTC_VERSION", Some(32409)),
+(active, pub_restricted, "1.65.0", Some(32409)),
 ```
 
 The above line should be moved down to the area for "accepted"
@@ -118,13 +118,13 @@ When it is done, it should look like:
 
 ```rust,ignore
 // pub(restricted) visibilities (RFC 1422)
-(accepted, pub_restricted, "CURRENT_RUSTC_VERSION", Some(32409)),
+(accepted, pub_restricted, "1.65.0", Some(32409)),
 // note that we changed this
 ```
 
 (Even though you will encounter version numbers in the file of past changes,
 you should not put the rustc version you expect your stabilization to happen in,
-but instead `CURRENT_RUSTC_VERSION`)
+but instead `1.65.0`)
 
 ### Removing existing uses of the feature-gate

We should change it not to recurse into submodules, or at least that submodule.

cc @Mark-Simulacrum @est31

@pietroalbini pietroalbini added C-bug Category: This is a bug. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Sep 19, 2022
@est31
Copy link
Member

est31 commented Sep 19, 2022

Yeah it shouldn't recurse there. I have made it specifically avoid the list of submodules defined in tidy, but apparently rustc-dev-guide is not part of that list. I guess adding it there should be quite easy and solve the problem.

@est31
Copy link
Member

est31 commented Sep 19, 2022

PR filed: #102017

I didn't notice this because back when I ran the tool locally for testing, rust-lang/rustc-dev-guide#1443 hadn't been merged yet, so it wouldn't show up as change. I didn't run it again later. Anyways, I'm glad that it went so smooth so far outside of this one bug.

@pietroalbini
Copy link
Member Author

Thanks for the quick fix!

@bors bors closed this as completed in ade6505 Sep 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-bug Category: This is a bug. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants