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

Fix x.py setup sets changelog-seen #77746

Merged
merged 1 commit into from
Oct 12, 2020
Merged

Fix x.py setup sets changelog-seen #77746

merged 1 commit into from
Oct 12, 2020

Conversation

winnsterx
Copy link
Contributor

@winnsterx winnsterx commented Oct 9, 2020

Fixes #77572 by setting changelog-seen in setup.rs

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 9, 2020
@jyn514
Copy link
Member

jyn514 commented Oct 9, 2020

r? @jyn514

@jyn514 jyn514 added A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) C-bug Category: This is a bug. labels Oct 9, 2020
src/bootstrap/bin/main.rs Outdated Show resolved Hide resolved
src/bootstrap/setup.rs Outdated Show resolved Hide resolved
@jyn514 jyn514 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 9, 2020
@jyn514
Copy link
Member

jyn514 commented Oct 11, 2020

You need to run x.py fmt:

 If you're running `tidy`, try again with `--bless`. Or, if you just want to format code, run `./x.py fmt` instead.
     let config = Config::parse(&args);
 
     // check_version warnings are not printed during setup
-    let changelog_suggestion = if matches!(config.cmd, Subcommand::Setup {..}) {
-        None
-    } else {
-        check_version(&config)
-    };
+    let changelog_suggestion =
+        if matches!(config.cmd, Subcommand::Setup {..}) { None } else { check_version(&config) };

r=me after that, thanks so much for working on this!

@jyn514
Copy link
Member

jyn514 commented Oct 11, 2020

also, if you could squash the commits, that would be great: https://rustc-dev-guide.rust-lang.org/git.html#advanced-rebasing. I won't block on that though.

More print statementsstatements lol

Solved the basic case of eliminating check_version ifk_version if subcommand = setup

Finished v1

checking out old bootstrap.py

checked out old irrelevant files

fixed tidy

Moved VERSION from bin/main.rs to lib.rs

Fixed semicolon return issue

x.py fmt
@jyn514
Copy link
Member

jyn514 commented Oct 11, 2020

@bors r+

Thanks for working on this!

@bors
Copy link
Contributor

bors commented Oct 11, 2020

📌 Commit d7494af has been approved by jyn514

@bors bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 11, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 12, 2020
Fix `x.py setup` sets `changelog-seen`

Fixes rust-lang#77572 by setting changelog-seen in setup.rs
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Oct 12, 2020
Fix `x.py setup` sets `changelog-seen`

Fixes rust-lang#77572 by setting changelog-seen in setup.rs
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 12, 2020
Rollup of 10 pull requests

Successful merges:

 - rust-lang#77550 (add shims for WithOptConstParam query calls)
 - rust-lang#77699 (Add word wrap for short descriptions)
 - rust-lang#77724 (Implement `AsRawFd` for `StdinLock` etc. on WASI.)
 - rust-lang#77746 (Fix `x.py setup` sets `changelog-seen`)
 - rust-lang#77784 (Fix intra-docs link in core::ffi::VaList)
 - rust-lang#77811 (rustdoc: Make some functions private that don't need to be public)
 - rust-lang#77818 (Mono collector: replace pair of ints with Range)
 - rust-lang#77831 (Use std methods on char instead of open coding them)
 - rust-lang#77852 (update url in bootstrap README (gcc-rs -> cc-rs))
 - rust-lang#77863 (Remove `mark-i-m` from rustc-dev-guide maintainers)

Failed merges:

r? `@ghost`
@bors bors merged commit dde9977 into rust-lang:master Oct 12, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-contributor-roadblock Area: Makes things more difficult for new contributors to rust itself C-bug Category: This is a bug. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

x.py setup should set changelog-seen
6 participants