mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use :vis in thread_local!

Browse Source
This commit is contained in:
Alex Burka 2017-04-19 02:29:40 +00:00
parent b6a2d7e822
commit 8cce5bc7ab
2 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libstd/lib.rs
View File

@ -277,6 +277,7 @@
#![feature(link_args)]
#![feature(linkage)]
#![feature(macro_reexport)]
#![feature(macro_vis_matcher)]
#![feature(needs_panic_runtime)]
#![feature(needs_drop)]
#![feature(never_type)]

38
src/libstd/thread/local.rs
View File

@ -139,37 +139,15 @@ macro_rules! thread_local {
// empty (base case for the recursion)
() => {};
// process multiple declarations where the first one is private
($(#[$attr:meta])* static $name:ident: $t:ty = $init:expr; $($rest:tt)*) => (
__thread_local_inner!($(#[$attr])* [] $name, $t, $init);
// process multiple declarations
($(#[$attr:meta])* $vis:vis static $name:ident: $t:ty = $init:expr; $($rest:tt)*) => (
__thread_local_inner!($(#[$attr])* $vis $name, $t, $init);
thread_local!($($rest)*);
);
// handle a single private declaration
($(#[$attr:meta])* static $name:ident: $t:ty = $init:expr) => (
__thread_local_inner!($(#[$attr])* [] $name, $t, $init);
);
// handle multiple declarations where the first one is public
($(#[$attr:meta])* pub static $name:ident: $t:ty = $init:expr; $($rest:tt)*) => (
__thread_local_inner!($(#[$attr])* [pub] $name, $t, $init);
thread_local!($($rest)*);
);
// handle a single public declaration
($(#[$attr:meta])* pub static $name:ident: $t:ty = $init:expr) => (
__thread_local_inner!($(#[$attr])* [pub] $name, $t, $init);
);
// handle multiple declarations where the first one is restricted public
($(#[$attr:meta])* pub $vis:tt static $name:ident: $t:ty = $init:expr; $($rest:tt)*) => (
__thread_local_inner!($(#[$attr])* [pub $vis] $name, $t, $init);
thread_local!($($rest)*);
);
// handle a single restricted public declaration
($(#[$attr:meta])* pub $vis:tt static $name:ident: $t:ty = $init:expr) => (
__thread_local_inner!($(#[$attr])* [pub $vis] $name, $t, $init);
// handle a single declaration
($(#[$attr:meta])* $vis:vis static $name:ident: $t:ty = $init:expr) => (
__thread_local_inner!($(#[$attr])* $vis $name, $t, $init);
);
}
@ -180,8 +158,8 @@ macro_rules! thread_local {
#[macro_export]
#[allow_internal_unstable]
macro_rules! __thread_local_inner {
($(#[$attr:meta])* [$($vis:tt)*] $name:ident, $t:ty, $init:expr) => {
$(#[$attr])* $($vis)* static $name: $crate::thread::LocalKey<$t> = {
($(#[$attr:meta])* $vis:vis $name:ident, $t:ty, $init:expr) => {
$(#[$attr])* $vis static $name: $crate::thread::LocalKey<$t> = {
fn __init() -> $t { $init }
fn __getit() -> $crate::option::Option<