summary refs log tree commit diff
path: root/src/libcoretest
diff options
context:
space:
mode:
authorNick Cameron <ncameron@mozilla.com>2015-01-07 11:33:42 +1300
committerNick Cameron <ncameron@mozilla.com>2015-01-07 12:10:31 +1300
commit9f07d055f7823ac0e17e014f3effa2a0be0947e9 (patch)
treeb4a0f390cd26323522cbcfaf7ba2464fc5f13bb2 /src/libcoretest
parent91ba66fa99830d4963d6adb47439b86253bf5a4c (diff)
downloadrust-9f07d055f7823ac0e17e014f3effa2a0be0947e9.tar.gz
rust-9f07d055f7823ac0e17e014f3effa2a0be0947e9.zip
markers -> marker
Diffstat (limited to 'src/libcoretest')
-rw-r--r--src/libcoretest/hash/mod.rs2
-rw-r--r--src/libcoretest/num/mod.rs2
-rw-r--r--src/libcoretest/option.rs4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libcoretest/hash/mod.rs b/src/libcoretest/hash/mod.rs
index 3af38f9035d..63bf9ec3314 100644
--- a/src/libcoretest/hash/mod.rs
+++ b/src/libcoretest/hash/mod.rs
@@ -7,7 +7,7 @@
 // <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.
-use core::markers::Sized;
+use core::marker::Sized;
 use std::mem;
 
 use core::slice::SliceExt;
diff --git a/src/libcoretest/num/mod.rs b/src/libcoretest/num/mod.rs
index 57e0737e909..1e8d2d4bc61 100644
--- a/src/libcoretest/num/mod.rs
+++ b/src/libcoretest/num/mod.rs
@@ -12,7 +12,7 @@ use core::cmp::PartialEq;
 use core::fmt::Show;
 use core::num::{NumCast, cast};
 use core::ops::{Add, Sub, Mul, Div, Rem};
-use core::markers::Copy;
+use core::marker::Copy;
 
 #[cfg_attr(stage0, macro_escape)]
 #[cfg_attr(not(stage0), macro_use)]
diff --git a/src/libcoretest/option.rs b/src/libcoretest/option.rs
index 5588fbce26a..1169f910238 100644
--- a/src/libcoretest/option.rs
+++ b/src/libcoretest/option.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use core::option::*;
-use core::markers;
+use core::marker;
 use core::mem;
 use core::clone::Clone;
 
@@ -82,7 +82,7 @@ fn test_option_dance() {
 
 #[test] #[should_fail]
 fn test_option_too_much_dance() {
-    let mut y = Some(markers::NoCopy);
+    let mut y = Some(marker::NoCopy);
     let _y2 = y.take().unwrap();
     let _y3 = y.take().unwrap();
 }