diff options
| author | bors <bors@rust-lang.org> | 2022-02-25 13:28:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-02-25 13:28:49 +0000 |
| commit | 9f8f0a6e9484fe25517c082a5cbe1e9edb17c8a8 (patch) | |
| tree | 73d3fa90a8ca718ed39a8529e1901015f3a9bdc6 /library/std/src | |
| parent | 9b2a46591ad0cc9dbe7699c17e2ecdb4dc921228 (diff) | |
| parent | 60606456d3b5cd4baf68f18191b0cfca57d9c85c (diff) | |
| download | rust-9f8f0a6e9484fe25517c082a5cbe1e9edb17c8a8.tar.gz rust-9f8f0a6e9484fe25517c082a5cbe1e9edb17c8a8.zip | |
Auto merge of #94357 - matthiaskrgr:rollup-xrjaof3, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #93845 (Remove in band lifetimes) - #94155 (Extend toggle GUI test a bit) - #94252 (don't special case `DefKind::Ctor` in encoding) - #94305 (Remove an unnecessary restriction in `dest_prop`) - #94343 (Miri fn ptr check: don't use conservative null check) - #94344 (diagnostic: suggest parens when users want logical ops, but get closures) - #94352 (Fix SGX docs build) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/os/fd/owned.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/os/fd/owned.rs b/library/std/src/os/fd/owned.rs index 71c660e7186..d72f9a2ff9c 100644 --- a/library/std/src/os/fd/owned.rs +++ b/library/std/src/os/fd/owned.rs @@ -8,7 +8,7 @@ use crate::fmt; use crate::fs; use crate::marker::PhantomData; use crate::mem::forget; -#[cfg(not(target_os = "wasi"))] +#[cfg(not(any(target_os = "wasi", target_env = "sgx")))] use crate::sys::cvt; use crate::sys_common::{AsInner, FromInner, IntoInner}; |