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.

Sign up for GitHub

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

Jump to bottom

Remove missed cfg(bootstrap) #73187

Merged
merged 1 commit into from
Jun 12, 2020
Merged

Remove missed cfg(bootstrap) #73187

merged 1 commit into from
Jun 12, 2020

Conversation

mati865
Copy link
Contributor

@mati865 mati865 commented Jun 9, 2020

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(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 9, 2020
@mati865
Copy link
Contributor Author

mati865 commented Jun 9, 2020

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

Ah this was missed because of using cfg! instead of cfg.

@bors r+

@bors
Copy link
Contributor

bors commented Jun 11, 2020

📌 Commit 377c550 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 11, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 11, 2020
@Dylan-DPC
Rollup merge of rust-lang#73187 - mati865:bootstrap-cleanup, r=Mark-S…
c8a2f53 
…imulacrum

Remove missed `cfg(bootstrap)`
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jun 11, 2020
Closed
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jun 11, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 11, 2020
@bors
Auto merge of rust-lang#73259 - Dylan-DPC:rollup-m6nw1n0, r=Dylan-DPC
14027f3 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#73033 (Fix #[thread_local] statics as asm! sym operands)
 - rust-lang#73036 (std: Enable atomic.fence emission on wasm32)
 - rust-lang#73163 (Add long error explanation for E0724)
 - rust-lang#73187 (Remove missed `cfg(bootstrap)`)
 - rust-lang#73195 (Provide suggestion to convert numeric op LHS rather than unwrapping RHS)
 - rust-lang#73247 (Add various Zulip notifications for prioritization)
 - rust-lang#73254 (Add comment about LocalDefId -> DefId)

Failed merges:

r? @ghost
@bors bors merged commit 838d25b into rust-lang:master Jun 12, 2020
@mati865 mati865 deleted the bootstrap-cleanup branch June 12, 2020 07:05
@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
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.46
Development

Successfully merging this pull request may close these issues.
6 participants
@mati865 @rust-highfive @Mark-Simulacrum @bors @cuviper @nikomatsakis