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

Force to use the stage 2 compiler when config.download_rustc is set #108866

Merged
merged 1 commit into from
Mar 8, 2023

Conversation

Kohei316
Copy link
Contributor

@Kohei316 Kohei316 commented Mar 7, 2023

Fixes #108768

@rustbot
Copy link
Collaborator

rustbot commented Mar 7, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ozkanonur (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 Mar 7, 2023
Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

thank you for the fix, please consider suggestion from @albertlarsan68, I will queue the PR after that

@Kohei316 Kohei316 requested review from albertlarsan68 and onur-ozkan and removed request for albertlarsan68 March 7, 2023 16:38
@onur-ozkan
Copy link
Member

can you squash your commits into single commit?

Comment on lines 1212 to 1216
/// Tests whether the `compiler` compiling for `target` should be forced to
/// use a stage2 compiler instead.
///
/// If we use a downloaded, pre-compiled version of rustc it should be forced to
/// use a stage2 compiler.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
/// Tests whether the `compiler` compiling for `target` should be forced to
/// use a stage2 compiler instead.
///
/// If we use a downloaded, pre-compiled version of rustc it should be forced to
/// use a stage2 compiler.
/// Checks whether the `compiler` compiling for `target` should be forced to
/// use a stage2 compiler instead.
///
/// When we download the pre-compiled version of rustc it should be forced to
/// use a stage2 compiler.

Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

Waiting for CI to be green

@onur-ozkan
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 7, 2023

📌 Commit 740d476 has been approved by ozkanonur

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 Mar 7, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 7, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#108460 (migrate `rustc_hir_analysis` to session diagnostic [Part Two])
 - rust-lang#108581 (Add a new config flag, dist.include-mingw-linker.)
 - rust-lang#108583 (Account for binders correctly when adding default RPITIT method assumption)
 - rust-lang#108783 (Sync rustc_codegen_gcc 2023/03/04)
 - rust-lang#108793 (Append to existing `PYTHONPATH` in compiletest instead of overwriting)
 - rust-lang#108822 (Remove references to PassManagerBuilder)
 - rust-lang#108866 (Force to use the stage 2 compiler  when config.download_rustc is set)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b0ec353 into rust-lang:master Mar 8, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 8, 2023
@jsha
Copy link
Contributor

jsha commented Mar 18, 2023

This PR may have caused a failure running tests for some users: #109286

Uplifting library (stage2 -> stage0)
Error: Unable to find the stamp file ...rust/build/x86_64-unknown-linux-gnu/stage2-std/x86_64-unknown-linux-gnu/release/.libstd.stamp, did you try to keep a nonexistent build stage?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

x test --stage 2 std uses the wrong stage when download-rustc is enabled
6 participants