diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-10-24 22:39:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-24 22:39:44 +0200 |
| commit | e34263d86a41dc896d025dc767c8d7c77afe219b (patch) | |
| tree | 598a3f38d08aa23d8d3d101d8ca1695318f1f516 /library/alloc/src/alloc.rs | |
| parent | a547055184c55961b3e7d89b031d0e7b07de0a36 (diff) | |
| parent | bf268fe928eae8d85a868ccdbcc086ea033ae51c (diff) | |
| download | rust-e34263d86a41dc896d025dc767c8d7c77afe219b.tar.gz rust-e34263d86a41dc896d025dc767c8d7c77afe219b.zip | |
Rollup merge of #77610 - hermitcore:dtors, r=m-ou-se
revise Hermit's mutex interface to support the behaviour of StaticMutex rust-lang/rust#77147 simplifies things by splitting this Mutex type into two types matching the two use cases: StaticMutex and MovableMutex. To support the new behavior of StaticMutex, we move part of the mutex implementation into libstd. The interface to the OS changed. Consequently, I removed a few functions, which aren't longer needed.
Diffstat (limited to 'library/alloc/src/alloc.rs')
| -rw-r--r-- | library/alloc/src/alloc.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/alloc/src/alloc.rs b/library/alloc/src/alloc.rs index 109c3a0e683..dd7dcfbc4aa 100644 --- a/library/alloc/src/alloc.rs +++ b/library/alloc/src/alloc.rs @@ -372,7 +372,7 @@ pub fn handle_alloc_error(layout: Layout) -> ! { unsafe { oom_impl(layout) } } -#[cfg(not(any(test, bootstrap)))] +#[cfg(not(any(target_os = "hermit", test, bootstrap)))] #[doc(hidden)] #[allow(unused_attributes)] #[unstable(feature = "alloc_internals", issue = "none")] |