override user defined channel when using precompiled rustc by onur-ozkan · Pull Request #126572 · rust-lang/rust (original) (raw)
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 andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation5 Commits2 Checks6 Files changed
Conversation
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
[ Show hidden characters]({{ revealButtonHref }})
We need to override rust.channel
if it's manually specified when using the CI rustc. This is because if the compiler uses a different channel than the one specified in config.toml, tests may fail due to using a different channel than the one used by the compiler during tests.
For more context, see #122709 (comment).
Signed-off-by: onur-ozkan work@onurozkan.dev
This is already handled at the config parsing level, so we can simplify it.
Signed-off-by: onur-ozkan work@onurozkan.dev
r? @clubby789
rustbot has assigned @clubby789.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.
Use r?
to explicitly pick a reviewer
rustbot added S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
labels
This PR modifies src/bootstrap/src/core/config
.
If appropriate, please update CONFIG_CHANGE_HISTORY
in src/bootstrap/src/utils/change_tracker.rs
.
📌 Commit 5ae2446 has been approved by clubby789
It is now in the queue for this repository.
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
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request
…by789
override user defined channel when using precompiled rustc
We need to override rust.channel
if it's manually specified when using the CI rustc. This is because if the compiler uses a different channel than the one specified in config.toml, tests may fail due to using a different channel than the one used by the compiler during tests.
For more context, see rust-lang#122709 (comment).
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request
…by789
override user defined channel when using precompiled rustc
We need to override rust.channel
if it's manually specified when using the CI rustc. This is because if the compiler uses a different channel than the one specified in config.toml, tests may fail due to using a different channel than the one used by the compiler during tests.
For more context, see rust-lang#122709 (comment).
bors added a commit to rust-lang-ci/rust that referenced this pull request
…llaumeGomez
Rollup of 9 pull requests
Successful merges:
- rust-lang#123782 (Test that opaque types can't have themselves as a hidden type with incompatible lifetimes)
- rust-lang#124580 (Suggest removing unused tuple fields if they are the last fields)
- rust-lang#125852 (improve tip for inaccessible traits)
- rust-lang#126422 (Suggest using a standalone doctest for non-local impl defs)
- rust-lang#126427 (Rewrite
intrinsic-unreachable
,sepcomp-cci-copies
,sepcomp-inlining
andsepcomp-separate
run-make
tests to rmake.rs) - rust-lang#126493 (safe transmute: support non-ZST, variantful, uninhabited enums)
- rust-lang#126572 (override user defined channel when using precompiled rustc)
- rust-lang#126615 (Add
rustc-ice*
to.gitignore
) - rust-lang#126632 (Replace
move||
withmove ||
)
Failed merges:
- rust-lang#126558 (hir_typeck: be more conservative in making "note caller chooses ty param" note)
r? @ghost
@rustbot
modify labels: rollup
jieyouxu added a commit to jieyouxu/rust that referenced this pull request
…by789
override user defined channel when using precompiled rustc
We need to override rust.channel
if it's manually specified when using the CI rustc. This is because if the compiler uses a different channel than the one specified in config.toml, tests may fail due to using a different channel than the one used by the compiler during tests.
For more context, see rust-lang#122709 (comment).
bors added a commit to rust-lang-ci/rust that referenced this pull request
Rollup of 6 pull requests
Successful merges:
- rust-lang#125447 (Allow constraining opaque types during subtyping in the trait system)
- rust-lang#125766 (MCDC Coverage: instrument last boolean RHS operands from condition coverage)
- rust-lang#125880 (Remove
src/tools/rust-demangler
) - rust-lang#126154 (StorageLive: refresh storage (instead of UB) when local is already live)
- rust-lang#126572 (override user defined channel when using precompiled rustc)
- rust-lang#126662 (Unconditionally warn on usage of
wasm32-wasi
)
r? @ghost
@rustbot
modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request
Rollup merge of rust-lang#126572 - onur-ozkan:channel-problem, r=clubby789
override user defined channel when using precompiled rustc
We need to override rust.channel
if it's manually specified when using the CI rustc. This is because if the compiler uses a different channel than the one specified in config.toml, tests may fail due to using a different channel than the one used by the compiler during tests.
For more context, see rust-lang#122709 (comment).
Labels
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)