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

bootstrap: no config.toml exists regression #73590

Merged
merged 1 commit into from
Jun 23, 2020

Conversation

davidtwco
Copy link
Member

@davidtwco davidtwco commented Jun 21, 2020

Fixes #73574.

This PR fixes a regression introduced in #73317 where an oversight meant that config.toml was assumed to exist.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 21, 2020
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

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

r=me if you don't have time / don't want to fix the comment, but please file an issue for it in that case.

src/bootstrap/bootstrap.py Outdated Show resolved Hide resolved
This commit fixes a regression introduced in rust-lang#73317 where an oversight
meant that `config.toml` was assumed to exist.

Signed-off-by: David Wood <david@davidtw.co>
@davidtwco davidtwco force-pushed the bootstrap-fix-config-env-var branch from 2141e5b to b60ec47 Compare June 22, 2020 09:03
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 22, 2020

📌 Commit b60ec47 has been approved by Mark-Simulacrum

@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 22, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 22, 2020
…var, r=Mark-Simulacrum

bootstrap: no `config.toml` exists regression

Fixes rust-lang#73574.

This PR fixes a regression introduced in rust-lang#73317 where an oversight meant that `config.toml` was assumed to exist.
This was referenced Jun 22, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 23, 2020
…arth

Rollup of 9 pull requests

Successful merges:

 - rust-lang#72271 (Improve compiler error message for wrong generic parameter order)
 - rust-lang#72493 ( move leak-check to during coherence, candidate eval)
 - rust-lang#73398 (A way forward for pointer equality in const eval)
 - rust-lang#73472 (Clean up E0689 explanation)
 - rust-lang#73496 (Account for multiple impl/dyn Trait in return type when suggesting `'_`)
 - rust-lang#73515 (Add second message for LiveDrop errors)
 - rust-lang#73567 (Clarify --extern documentation.)
 - rust-lang#73572 (Fix typos in doc comments)
 - rust-lang#73590 (bootstrap: no `config.toml` exists regression)

Failed merges:

r? @ghost
@bors bors merged commit 44900f8 into rust-lang:master Jun 23, 2020
@davidtwco davidtwco deleted the bootstrap-fix-config-env-var branch June 25, 2020 11:08
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

#73317 causes ./x.py to fail on my Mojave macOS
5 participants