diff options
| author | bors <bors@rust-lang.org> | 2020-10-24 21:42:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-10-24 21:42:39 +0000 |
| commit | f58ffc93815f76576eb56df4bdeec2fe8f12b766 (patch) | |
| tree | 60e8bc7b8fe3ab206a1cedc66fc90627d4bfdb24 /library/std/src/sys/mod.rs | |
| parent | ffa2e7ae8fbf9badc035740db949b9dae271c29f (diff) | |
| parent | 58ae889779e761e35d3ca0c8c7beb92cde52dd7d (diff) | |
Auto merge of #78334 - jonas-schievink:rollup-z0gzbmm, r=jonas-schievink
Rollup of 12 pull requests
Successful merges:
- #75115 (`#[deny(unsafe_op_in_unsafe_fn)]` in sys/cloudabi)
- #76614 (change the order of type arguments on ControlFlow)
- #77610 (revise Hermit's mutex interface to support the behaviour of StaticMutex)
- #77830 (Simplify query proc-macros)
- #77930 (Do not ICE with TraitPredicates containing [type error])
- #78069 (Fix const core::panic!(non_literal_str).)
- #78072 (Cleanup constant matching in exhaustiveness checking)
- #78119 (Throw core::panic!("message") as &str instead of String.)
- #78191 (Introduce a temporary for discriminant value in MatchBranchSimplification)
- #78272 (const_evaluatable_checked: deal with unused nodes + div)
- #78318 (TyCtxt: generate single impl block with `slice_interners` macro)
- #78327 (resolve: Relax macro resolution consistency check to account for any errors)
Failed merges:
r? `@ghost`
Diffstat (limited to 'library/std/src/sys/mod.rs')
| -rw-r--r-- | library/std/src/sys/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs index 7b5fac922d0..b4628b64911 100644 --- a/library/std/src/sys/mod.rs +++ b/library/std/src/sys/mod.rs @@ -89,6 +89,7 @@ cfg_if::cfg_if! { #[stable(feature = "rust1", since = "1.0.0")] pub use self::ext as windows_ext; } else if #[cfg(any(target_os = "cloudabi", + target_os = "hermit", target_arch = "wasm32", all(target_vendor = "fortanix", target_env = "sgx")))] { // On CloudABI and wasm right now the shim below doesn't compile, so |