Skip to content

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

Merged
bors merged 1 commit into
masterfrom
unknown repository
Jun 3, 2023
Merged

bootstrap: Rename profile = user to profile = dist#112166
bors merged 1 commit into
masterfrom
unknown repository

Conversation

@ghost

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

Copy link
Copy Markdown

Fixes#112074

@rustbot

rustbot commented Jun 1, 2023

Copy link
Copy Markdown
Collaborator

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

@rustbotrustbot 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

ghost commented Jun 1, 2023

Copy link
Copy Markdown
Author

@clubby789 can u take a look

@clubby789

clubby789 commented Jun 1, 2023

Copy link
Copy Markdown
Contributor

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

@ghost

ghost commented Jun 1, 2023

Copy link
Copy Markdown
Author

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

Sure

@ghost

ghost commented Jun 1, 2023

Copy link
Copy Markdown
Author

Imma do it then do the PR

@ghostghost closed this Jun 1, 2023
@ghostghost reopened this Jun 1, 2023
@ghost

ghost commented Jun 1, 2023

Copy link
Copy Markdown
Author

@clubby789 can u take a look

@clubby789

clubby789 commented Jun 1, 2023

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 1, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit a45fc94 has been approved by clubby789

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 Jun 1, 2023
@compiler-errors

compiler-errors commented Jun 1, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

@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-errorscompiler-errors changed the title bootstrap: Rename profile = user to profile = dist #112074bootstrap: Rename profile = user to profile = distJun 1, 2023
@ghost

ghost commented Jun 1, 2023

Copy link
Copy Markdown
Author

@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

bors commented Jun 2, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a45fc94 with merge 37c0c16318363ed8b5240119170888b31c53188b...

@compiler-errorscompiler-errors mentioned this pull request Jun 2, 2023
Merged
@compiler-errors

compiler-errors commented Jun 2, 2023

Copy link
Copy Markdown
Contributor

@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 ofrust-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

rust-log-analyzer commented Jun 2, 2023

Copy link
Copy Markdown
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:masterJun 3, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 3, 2023
@jyn514

jyn514 commented Jun 3, 2023

Copy link
Copy Markdown
Member

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.

@jyn514jyn514 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 ofrust-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 (closesrust-lang#112846)
cc `@AnakinSkywalkeer`
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 21, 2023
@GuillaumeGomez
Rollup merge ofrust-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 (closesrust-lang#112846)
cc ``@AnakinSkywalkeer``
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@clubby789clubby789

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant 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