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

Treat 0 as special value for codegen-units-std #61497

Merged
merged 1 commit into from
Jun 4, 2019

Conversation

Mark-Simulacrum
Copy link
Member

Fixes #57669

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

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

Looks good to me! Could this be deduplicated with the previous setting to use the same mapping logic? Other than that r=me

@Mark-Simulacrum Mark-Simulacrum force-pushed the codegen-units-std-num-cpus branch from df51f73 to 5ce3c81 Compare June 3, 2019 18:57
@Mark-Simulacrum
Copy link
Member Author

@bors r=alexcrichton rollup

@bors
Copy link
Contributor

bors commented Jun 3, 2019

📌 Commit 5ce3c81 has been approved by alexcrichton

@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 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Jun 4, 2019
…um-cpus, r=alexcrichton

Treat 0 as special value for codegen-units-std

Fixes rust-lang#57669
Centril added a commit to Centril/rust that referenced this pull request Jun 4, 2019
…um-cpus, r=alexcrichton

Treat 0 as special value for codegen-units-std

Fixes rust-lang#57669
Centril added a commit to Centril/rust that referenced this pull request Jun 4, 2019
…um-cpus, r=alexcrichton

Treat 0 as special value for codegen-units-std

Fixes rust-lang#57669
bors added a commit that referenced this pull request Jun 4, 2019
Rollup of 13 pull requests

Successful merges:

 - #61135 (Fix documentation of `Rc::make_mut` regarding `rc::Weak`.)
 - #61404 (miri unsizing: fix projecting into a field of an operand)
 - #61409 (Fix an ICE with a const argument in a trait)
 - #61413 (Re-implement async fn drop order lowering )
 - #61419 (Add an unusual-conversion example to to_uppercase)
 - #61420 (Succinctify splice docs)
 - #61444 (Suggest using `as_ref` on `*const T`)
 - #61446 (On TerminatorKind::DropAndReplace still handle unused_mut correctly)
 - #61485 (azure: retry s3 upload if it fails)
 - #61489 (ci: Reenable step timings on AppVeyor)
 - #61496 (Do not panic in tidy on unbalanced parentheses in cfg's)
 - #61497 (Treat 0 as special value for codegen-units-std)
 - #61499 (Add regression test for existential type ICE #53457)

Failed merges:

r? @ghost
@bors bors merged commit 5ce3c81 into rust-lang:master Jun 4, 2019
@Mark-Simulacrum Mark-Simulacrum deleted the codegen-units-std-num-cpus branch June 8, 2019 13:49
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.

x.py: codegen-units-std = 0 not supported
4 participants