refactor fn bootstrap::builder::Builder::compiler_for logic#109295
Merged
bors merged 1 commit intorust-lang:masterfrom Mar 22, 2023
Merged
refactor fn bootstrap::builder::Builder::compiler_for logic#109295bors merged 1 commit intorust-lang:masterfrom
fn bootstrap::builder::Builder::compiler_for logic#109295bors merged 1 commit intorust-lang:masterfrom
Conversation
Collaborator
|
(rustbot has picked a reviewer for you, use r? to override) |
Contributor
Author
|
r? @jyn514 |
fn bootstrap::builder::Builder::compiler_forfn bootstrap::builder::Builder::compiler_for logic
Member
|
I don't have time for reviews, sorry. |
Contributor
Author
I think Mark is quite busy too. Can you review this ? @albertlarsan68 |
src/bootstrap/builder.rs
Outdated
Member
There was a problem hiding this comment.
I would prefer that we avoid creating Compiler structs if they don't correspond to an already-built compiler (i.e., the only constructor should be self.compiler).
Can we refactor both force_use functions to take stage and host as separate values?
Member
|
r=me with nit fixed I'm generally not sure this is the right logic - the force-use functions feel pretty iffy to me - but I'm OK patching it for now. |
- check compiler stage before forcing for stage2. - check if download_rustc is not set before forcing for stage1. Signed-off-by: ozkanonur <work@onurozkan.dev>
3babf34 to
2ec7f6c
Compare
Contributor
Author
|
@Mark-Simulacrum fixed |
Contributor
Author
|
@bors r+ rollup |
Collaborator
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 21, 2023
refactor `fn bootstrap::builder::Builder::compiler_for` logic - check compiler stage before forcing for stage2. - check if download_rustc is not set before forcing for stage1. resolves rust-lang#109286
Dylan-DPC
added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 22, 2023
refactor `fn bootstrap::builder::Builder::compiler_for` logic - check compiler stage before forcing for stage2. - check if download_rustc is not set before forcing for stage1. resolves rust-lang#109286
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 22, 2023
Rollup of 11 pull requests Successful merges: - rust-lang#100311 (Fix handling of trailing bare CR in str::lines) - rust-lang#108997 (Change text -> rust highlighting in sanitizer.md) - rust-lang#109179 (move Option::as_slice to intrinsic) - rust-lang#109187 (Render source page layout with Askama) - rust-lang#109280 (Remove `VecMap`) - rust-lang#109295 (refactor `fn bootstrap::builder::Builder::compiler_for` logic) - rust-lang#109312 (rustdoc: Cleanup parent module tracking for doc links) - rust-lang#109317 (Update links for custom discriminants.) - rust-lang#109405 (RPITITs are `DefKind::Opaque` with new lowering strategy) - rust-lang#109414 (Do not consider synthesized RPITITs on missing items checks) - rust-lang#109435 (Detect uninhabited types early in const eval) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
resolves #109286