Skip to content

Remove missed cfg(bootstrap) - #73187

Merged
bors merged 1 commit into
rust-lang:masterfrom
mati865:bootstrap-cleanup
Jun 12, 2020
Merged

Remove missed cfg(bootstrap)#73187
bors merged 1 commit into
rust-lang:masterfrom
mati865:bootstrap-cleanup

Conversation

@mati865

Copy link
Copy Markdown
Member

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 9, 2020
@mati865

Copy link
Copy Markdown
MemberAuthor

r? @Mark-Simulacrum

@Mark-Simulacrum

Copy link
Copy Markdown
Member

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

@bors r+

@bors

bors commented Jun 11, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 377c550 has been approved by Mark-Simulacrum

@borsbors 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
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 11, 2020
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:masterJun 12, 2020
@mati865
mati865 deleted the bootstrap-cleanup branch June 12, 2020 07:05
@cuvipercuviper added this to the 1.46 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

6 participants

@mati865@rust-highfive@Mark-Simulacrum@bors@cuviper@nikomatsakis