about summary refs log tree commit diff
path: root/src/libstd/sync/mpsc/select.rs
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2015-01-06 14:03:46 +1300
committerNick Cameron <ncameron@mozilla.com>2015-01-07 09:45:28 +1300
commit503709708c72401dbe091ed5c7e0494efabe0669 (patch)
treef49a23475150a74cce2c203aa56a735d51564a1c /src/libstd/sync/mpsc/select.rs
parent6539cb417f4a7c2d9d1afce44c196578d2b67f38 (diff)
downloadrust-503709708c72401dbe091ed5c7e0494efabe0669.tar.gz
rust-503709708c72401dbe091ed5c7e0494efabe0669.zip
Change `std::kinds` to `std::markers`; flatten `std::kinds::marker`
[breaking-change]
Diffstat (limited to 'src/libstd/sync/mpsc/select.rs')
-rw-r--r--src/libstd/sync/mpsc/select.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs
index 16adbf5aa4f..ca7120b5ead 100644
--- a/src/libstd/sync/mpsc/select.rs
+++ b/src/libstd/sync/mpsc/select.rs
@@ -57,7 +57,7 @@
 use core::prelude::*;
 
 use core::cell::Cell;
-use core::kinds::marker;
+use core::markers;
 use core::mem;
 use core::uint;
 
@@ -70,7 +70,7 @@ pub struct Select {
     head: *mut Handle<'static, ()>,
     tail: *mut Handle<'static, ()>,
     next_id: Cell<uint>,
-    marker1: marker::NoSend,
+    marker1: markers::NoSend,
 }
 
 /// A handle to a receiver which is currently a member of a `Select` set of
@@ -115,7 +115,7 @@ impl Select {
     /// rather much easier through the `select!` macro.
     pub fn new() -> Select {
         Select {
-            marker1: marker::NoSend,
+            marker1: markers::NoSend,
             head: 0 as *mut Handle<'static, ()>,
             tail: 0 as *mut Handle<'static, ()>,
             next_id: Cell::new(1),