about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-11-01 14:17:39 -0700
committerAlex Crichton <alex@alexcrichton.com>2018-11-01 14:17:39 -0700
commitff5226cd2fa12fe82c7cef8112905af7cb48fe9d (patch)
tree2577f2e5ba1b15c79d6434dd67040801129ae52c /src/test
parentf6e9a6e41cd9b1fb687e296b5a6d4c6ad399f862 (diff)
downloadrust-ff5226cd2fa12fe82c7cef8112905af7cb48fe9d.tar.gz
rust-ff5226cd2fa12fe82c7cef8112905af7cb48fe9d.zip
std: Enable usage of `thread_local!` through imports
The `thread_local!` macro delegated to an internal macro but it didn't
do so in a macros-and-the-module-system compatible fashion, meaning if a
`#![no_std]` crate imported `std` and tried to use `thread_local!` it
would fail due to missing a lookup of an internal macro.

This commit switches the macro to instead use `$crate` to invoke other
macros, ensuring that it'll work when `thread_local!` is imported alone.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/thread-local-not-in-prelude.rs18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/test/run-pass/thread-local-not-in-prelude.rs b/src/test/run-pass/thread-local-not-in-prelude.rs
new file mode 100644
index 00000000000..0c365597b82
--- /dev/null
+++ b/src/test/run-pass/thread-local-not-in-prelude.rs
@@ -0,0 +1,18 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![no_std]
+
+extern crate std;
+
+std::thread_local!(static A: usize = 30);
+
+fn main() {
+}