about summary refs log tree commit diff
path: root/src/libstd/thread_local
diff options
context:
space:
mode:
authorJorge Aparicio <japaricious@gmail.com>2014-12-13 23:06:44 -0500
committerJorge Aparicio <japaricious@gmail.com>2014-12-15 15:33:37 -0500
commit556d971f83ea5950444b0a5b5392cd0040f077f6 (patch)
tree26bd1449ae9625a61a4d9c52ab5050f0c86c376e /src/libstd/thread_local
parent1b97cd338b5d425b24e821e815d84005e38b390a (diff)
downloadrust-556d971f83ea5950444b0a5b5392cd0040f077f6.tar.gz
rust-556d971f83ea5950444b0a5b5392cd0040f077f6.zip
Remove internal uses of `marker::NoCopy`
Diffstat (limited to 'src/libstd/thread_local')
-rw-r--r--src/libstd/thread_local/mod.rs5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libstd/thread_local/mod.rs b/src/libstd/thread_local/mod.rs
index 2d5766c2393..76fb703514b 100644
--- a/src/libstd/thread_local/mod.rs
+++ b/src/libstd/thread_local/mod.rs
@@ -185,7 +185,6 @@ macro_rules! __thread_local_inner(
                 inner: ::std::cell::UnsafeCell { value: $init },
                 dtor_registered: ::std::cell::UnsafeCell { value: false },
                 dtor_running: ::std::cell::UnsafeCell { value: false },
-                marker: ::std::kinds::marker::NoCopy,
             }
         };
 
@@ -247,7 +246,6 @@ mod imp {
 
     use cell::UnsafeCell;
     use intrinsics;
-    use kinds::marker;
     use ptr;
 
     #[doc(hidden)]
@@ -264,9 +262,6 @@ mod imp {
         // these variables are thread-local, not global.
         pub dtor_registered: UnsafeCell<bool>, // should be Cell
         pub dtor_running: UnsafeCell<bool>, // should be Cell
-
-        // These shouldn't be copied around.
-        pub marker: marker::NoCopy,
     }
 
     #[doc(hidden)]