Skip to content

SGX target: fix cfg(test) build - #59857

Merged
bors merged 1 commit into
rust-lang:masterfrom
jethrogb:jb/sgx-test
Apr 12, 2019
Merged

SGX target: fix cfg(test) build#59857
bors merged 1 commit into
rust-lang:masterfrom
jethrogb:jb/sgx-test

Conversation

@jethrogb

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @alexcrichton

(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 Apr 10, 2019
@Centril

Copy link
Copy Markdown
Contributor

r? @Centril@bors r+ rollup

@bors

bors commented Apr 10, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit e2d1d66 has been approved by Centril

@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 Apr 10, 2019
cramertj added a commit to cramertj/rust that referenced this pull request Apr 11, 2019
@cramertjcramertj mentioned this pull request Apr 11, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 12, 2019
@CentrilCentril mentioned this pull request Apr 12, 2019
bors added a commit that referenced this pull request Apr 12, 2019
Rollup of 15 pull requests
Successful merges:
- #59680 (Document the -Z flag to the rustc book)
- #59711 (Add back the substring test)
- #59806 (compiletest: Improve no_prefer_dynamic docs)
- #59809 (Make trait_methods_not_found use a lock)
- #59811 (Kill dead code dominator code.)
- #59814 (Fix broken links on std::boxed doc page)
- #59821 (improve unknown enum variant errors)
- #59831 (Remove strange formatting in `Ordering` docs.)
- #59836 (std::ops::Div examples: correct nominator to numerator)
- #59857 (SGX target: fix cfg(test) build)
- #59876 (Update TRPL to use mdbook 0.2)
- #59880 (Remove note about transmute for float bitpatterns.)
- #59889 (Update diagnostics.rs)
- #59891 (Fix the link to sort_by_cached_key)
- #59894 (save-analysis: Pull associated type definition using `qpath_def`)
Failed merges:
r? @ghost
@bors
bors merged commit e2d1d66 into rust-lang:masterApr 12, 2019
@jethrogbjethrogb mentioned this pull request Apr 26, 2019
Centril added a commit to Centril/rust that referenced this pull request Apr 30, 2019
@workingjubileeworkingjubilee added the O-SGX Target: SGX label Jul 30, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-SGXTarget: SGXS-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

@jethrogb@rust-highfive@Centril@bors@alexcrichton@workingjubilee