diff options
| author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-08-09 06:41:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-09 06:41:16 +0900 |
| commit | dde4fb3fd21b333898740d7cdcc806ade9f46d51 (patch) | |
| tree | 6549ff4e7dd57723463a316f9401d4f06825343d /library/std/src/sys | |
| parent | 5bbdc73ebc208246755285f17485ba93305686ae (diff) | |
| parent | a4fb1d0b76a6e4e5e980a6839eb318a879635882 (diff) | |
| download | rust-dde4fb3fd21b333898740d7cdcc806ade9f46d51.tar.gz rust-dde4fb3fd21b333898740d7cdcc806ade9f46d51.zip | |
Rollup merge of #74842 - hermitcore:thread_local, r=Mark-Simulacrum
adjust remaining targets - fix commit 7dc3886 - previous commit doesn't adjust all targets
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/hermit/mod.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sys/hermit/thread.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/hermit/mod.rs b/library/std/src/sys/hermit/mod.rs index 675b82ceb77..8eaf07e52d6 100644 --- a/library/std/src/sys/hermit/mod.rs +++ b/library/std/src/sys/hermit/mod.rs @@ -106,7 +106,7 @@ pub unsafe extern "C" fn runtime_entry( argv: *const *const c_char, env: *const *const c_char, ) -> ! { - use crate::sys::hermit::fast_thread_local::run_dtors; + use crate::sys::hermit::thread_local_dtor::run_dtors; extern "C" { fn main(argc: isize, argv: *const *const c_char) -> i32; } diff --git a/library/std/src/sys/hermit/thread.rs b/library/std/src/sys/hermit/thread.rs index e11afed6687..7bd71e120de 100644 --- a/library/std/src/sys/hermit/thread.rs +++ b/library/std/src/sys/hermit/thread.rs @@ -4,7 +4,7 @@ use crate::ffi::CStr; use crate::io; use crate::mem; use crate::sys::hermit::abi; -use crate::sys::hermit::fast_thread_local::run_dtors; +use crate::sys::hermit::thread_local_dtor::run_dtors; use crate::time::Duration; pub type Tid = abi::Tid; |