diff options
| author | bors <bors@rust-lang.org> | 2020-04-09 00:11:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-09 00:11:27 +0000 |
| commit | d249d756374737eb014079901ac132f1e1ed905e (patch) | |
| tree | e40a76a168a79ea3db20a0671e7367756dbc93a3 /src/libstd/os | |
| parent | 1edcfc83c6a08ddc5e63fc652b149baea0236e7c (diff) | |
| parent | 5848209b64ad3403c155bc884f25500b178a5610 (diff) | |
| download | rust-d249d756374737eb014079901ac132f1e1ed905e.tar.gz rust-d249d756374737eb014079901ac132f1e1ed905e.zip | |
Auto merge of #70936 - Dylan-DPC:rollup-2ng3e5h, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #70134 (add basic support of OsStrExt for HermitCore) - #70565 (Add inline attributes for functions used in the query system) - #70828 (rustdoc: Don't try to load source files from external crates) - #70870 (Fix abuses of tykind::err) - #70906 (Suggest move for closures and async blocks in more cases.) - #70912 (Do not suggest adding type param when `use` is already suggested) - #70930 (add tracking issue to `VecDeque::make_contiguous`) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/os')
| -rw-r--r-- | src/libstd/os/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/os/mod.rs b/src/libstd/os/mod.rs index 91e37ed833a..0fa4a1d2353 100644 --- a/src/libstd/os/mod.rs +++ b/src/libstd/os/mod.rs @@ -24,7 +24,7 @@ cfg_if::cfg_if! { // If we're not documenting libstd then we just expose the main modules // as we otherwise would. - #[cfg(any(target_os = "redox", unix, target_os = "vxworks"))] + #[cfg(any(target_os = "redox", unix, target_os = "vxworks", target_os = "hermit"))] #[stable(feature = "rust1", since = "1.0.0")] pub use crate::sys::ext as unix; |