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.

Sign up for GitHub

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

Jump to bottom

bootstrap: Rename profile = user to profile = dist #112166

Merged
merged 1 commit into from Jun 3, 2023
Merged

bootstrap: Rename profile = user to profile = dist #112166

merged 1 commit into from Jun 3, 2023

Conversation

ghost
Copy link

@ghost ghost commented Jun 1, 2023 •
edited by compiler-errors
Loading

Fixes #112074

@rustbot
Copy link
Collaborator

rustbot commented Jun 1, 2023

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

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 1, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ghost
Copy link
Author

ghost commented Jun 1, 2023

@clubby789 can u take a look

@clubby789
Copy link
Contributor

This looks good to me. Would you mind squashing your commits into one?

@ghost
Copy link
Author

ghost commented Jun 1, 2023

This looks good to me. Would you mind squashing your commits into one?

Sure

@ghost
Copy link
Author

ghost commented Jun 1, 2023

Imma do it then do the PR

@ghost ghost closed this Jun 1, 2023
@ghost ghost reopened this Jun 1, 2023
@ghost
Copy link
Author

ghost commented Jun 1, 2023

@clubby789 can u take a look

@clubby789
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 1, 2023

📌 Commit a45fc94 has been approved by clubby789

It is now in the queue for this repository.

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 1, 2023
@compiler-errors
Copy link
Member

compiler-errors commented Jun 1, 2023 •
edited
Loading

@AnakinSkywalkeer, in the future, when you want to link your PR to an issue that is fixed, please put it in the PR message body instead of the title. That'll make sure it's automatically closed when the PR lands. (Also, a description wouldn't hurt for PRs in the future.)

I've fixed this one for you.

@compiler-errors compiler-errors changed the title bootstrap: Rename profile = user to profile = dist #112074 bootstrap: Rename profile = user to profile = dist Jun 1, 2023
@ghost
Copy link
Author

ghost commented Jun 1, 2023

@AnakinSkywalkeer, in the future, when you want to link your PR to an issue that is fixed, please put it in the PR message body instead of the title. That'll make sure it's automatically closed when the PR lands. (Also, a description wouldn't hurt for PRs in the future.)

I've fixed this one for you.

ohhh so sorry about that my bad gonna keep in mind next time

@bors
Copy link
Contributor

bors commented Jun 2, 2023

⌛ Testing commit a45fc94 with merge 37c0c16318363ed8b5240119170888b31c53188b...

@compiler-errors compiler-errors mentioned this pull request Jun 2, 2023
Merged
@compiler-errors
Copy link
Member

@bors retry yield to rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
@bors
Auto merge of rust-lang#112228 - compiler-errors:rollup-97i0pli, r=co…
7a0070e 
…mpiler-errors

Rollup of 6 pull requests

Successful merges:

 - rust-lang#109609 (Separate AnonConst from ConstBlock in HIR.)
 - rust-lang#112166 (bootstrap: Rename profile = user to profile = dist)
 - rust-lang#112168 (Lower `unchecked_div`/`_rem` to MIR's `BinOp::Div`/`Rem`)
 - rust-lang#112183 (Normalize anon consts in new solver)
 - rust-lang#112211 (pass `--lib` to `x doc`)
 - rust-lang#112223 (Don't ICE in new solver when auto traits have associated types)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors bors merged commit dd09f4d into rust-lang:master Jun 3, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 3, 2023
@jyn514
Copy link
Member

jyn514 commented Jun 3, 2023

This doesn't keep backwards compatibility like I asked for in the issue :/ it also doesn't update configure.py, so anyone using configure will be using an invalid profile; and it doesn't update the file in src/bootstrap/defaults.

I think the only effect of this is that it's no longer possible to pick user through x setup, and that choosing dist will give a hard error that the file isn't found. Please test your changes in the future.

@jyn514 jyn514 mentioned this pull request Jun 3, 2023
Closed
This was referenced Jun 20, 2023
Closed
Merged
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 21, 2023
@GuillaumeGomez
Rollup merge of rust-lang#112886 - clubby789:revert-user-dist, r=albe…
578ae1c 
…rtlarsan68

Revert 'Rename profile=user to profile=dist'

This reverts commit a45fc94 (rust-lang#112166)
Reverted as it didn't meet the requirements (rust-lang#112166 (comment)) and is causing issues (closes rust-lang#112846)

cc `@AnakinSkywalkeer`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 21, 2023
@GuillaumeGomez
Rollup merge of rust-lang#112886 - clubby789:revert-user-dist, r=albe…
a687a96 
…rtlarsan68

Revert 'Rename profile=user to profile=dist'

This reverts commit a45fc94 (rust-lang#112166)
Reverted as it didn't meet the requirements (rust-lang#112166 (comment)) and is causing issues (closes rust-lang#112846)

cc ``@AnakinSkywalkeer``
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@clubby789 clubby789

Labels
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
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.

bootstrap: Rename profile = user to profile = dist
6 participants
@rustbot @rust-log-analyzer @clubby789 @bors @compiler-errors @jyn514