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

x.py setup: Create config.toml in the current directory, not the top-level directory #78550

Merged
merged 1 commit into from
Oct 31, 2020

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Oct 30, 2020

See #78509 for discussion.

r? @pnkfelix
cc @cuviper @Mark-Simulacrum

@jyn514 jyn514 added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 30, 2020
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 30, 2020
@Mark-Simulacrum
Copy link
Member

r=me unless you specifically want to wait for @pnkfelix's review.

@jyn514
Copy link
Member Author

jyn514 commented Oct 31, 2020

@bors r=Mark-Simulacrum

I asked pnkfelix to review since I never heard back from them in the original thread, but from their bug report I think this is the behavior they expected.

@bors
Copy link
Contributor

bors commented Oct 31, 2020

📌 Commit 8cf7d66 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 Oct 31, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 31, 2020
x.py setup: Create config.toml in the current directory, not the top-level directory

See rust-lang#78509 for discussion.

r? @pnkfelix
cc @cuviper @Mark-Simulacrum
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Oct 31, 2020
x.py setup: Create config.toml in the current directory, not the top-level directory

See rust-lang#78509 for discussion.

r? @pnkfelix
cc @cuviper @Mark-Simulacrum
This was referenced Oct 31, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 31, 2020
Rollup of 7 pull requests

Successful merges:

 - rust-lang#74622 (Add std::panic::panic_any.)
 - rust-lang#77099 (make exp_m1 and ln_1p examples more representative of use)
 - rust-lang#78526 (Strip tokens from trait and impl items before printing AST JSON)
 - rust-lang#78550 (x.py setup: Create config.toml in the current directory, not the top-level directory)
 - rust-lang#78577 (validator: Extend aliasing check to a call terminator)
 - rust-lang#78581 (Constantify more BTreeMap and BTreeSet functions)
 - rust-lang#78587 (parser: Cleanup `LazyTokenStream` and avoid some clones)

Failed merges:

r? `@ghost`
@bors bors merged commit c0f356d into rust-lang:master Oct 31, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 31, 2020
@jyn514 jyn514 deleted the setup branch October 31, 2020 19:33
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.

7 participants