about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-05-25 01:51:35 +0000
committerbors <bors@rust-lang.org>2017-05-25 01:51:35 +0000
commitcf747fcbf716a8afced9d23aa15bb47d93805209 (patch)
treea2215e4dd219883e96acebbdcc24257c99d79133 /src/libstd/sys
parent5b13bff5203c1bdc6ac6dc87f69b5359a9503078 (diff)
parentd429b495a4bfba26d2c18fd9e140e17a787538d8 (diff)
downloadrust-cf747fcbf716a8afced9d23aa15bb47d93805209.tar.gz
rust-cf747fcbf716a8afced9d23aa15bb47d93805209.zip
Auto merge of #42212 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 15 pull requests

- Successful merges: #41980, #42071, #42120, #42134, #42141, #42142, #42149, #42150, #42159, #42177, #42186, #42191, #42195, #42198, #42211
- Failed merges:
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/redox/thread_local.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libstd/sys/redox/thread_local.rs b/src/libstd/sys/redox/thread_local.rs
index abdd9ace795..cacd84e2102 100644
--- a/src/libstd/sys/redox/thread_local.rs
+++ b/src/libstd/sys/redox/thread_local.rs
@@ -64,3 +64,8 @@ pub unsafe fn set(key: Key, value: *mut u8) {
 pub unsafe fn destroy(key: Key) {
     keys().remove(&key);
 }
+
+#[inline]
+pub fn requires_synchronized_create() -> bool {
+    false
+}