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

Fix SGX docs build #94352

Merged
merged 1 commit into from Feb 25, 2022
Merged

Fix SGX docs build #94352

merged 1 commit into from Feb 25, 2022

Conversation

jethrogb
Copy link
Contributor

@jethrogb jethrogb commented Feb 25, 2022 •
edited

Without this, I get

error[E0432]: unresolved import `crate::sys::cvt`
  --> library/std/src/os/fd/owned.rs:12:5
   |
12 | use crate::sys::cvt;
   |     ^^^^^^^^^^^^^^^ no `cvt` in `sys`

when running rustdoc on std for the x86_64-fortanix-unknown-sgx target.

@rust-highfive
Copy link
Collaborator

r? @dtolnay

(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 Feb 25, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Feb 25, 2022

📌 Commit 355d503 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 Feb 25, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Feb 25, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 25, 2022
@bors
Auto merge of rust-lang#94357 - matthiaskrgr:rollup-xrjaof3, r=matthi…
9f8f0a6 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#93845 (Remove in band lifetimes)
 - rust-lang#94155 (Extend toggle GUI test a bit)
 - rust-lang#94252 (don't special case `DefKind::Ctor` in encoding)
 - rust-lang#94305 (Remove an unnecessary restriction in `dest_prop`)
 - rust-lang#94343 (Miri fn ptr check: don't use conservative null check)
 - rust-lang#94344 (diagnostic: suggest parens when users want logical ops, but get closures)
 - rust-lang#94352 (Fix SGX docs build)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6060645 into rust-lang:master Feb 25, 2022
@rustbot rustbot added this to the 1.61.0 milestone Feb 25, 2022
@workingjubilee workingjubilee added the O-SGX Target: SGX label Jul 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dtolnay dtolnay

Labels
O-SGX Target: SGX 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.61.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@jethrogb @rust-highfive @Mark-Simulacrum @bors @dtolnay @workingjubilee @rustbot