about summary refs log tree commit diff
path: root/src/liblibc
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/liblibc
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/liblibc')
-rw-r--r--src/liblibc/lib.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs
index e3f02146a75..4255114243c 100644
--- a/src/liblibc/lib.rs
+++ b/src/liblibc/lib.rs
@@ -5081,5 +5081,7 @@ pub fn issue_14344_workaround() {} // FIXME #14344 force linkage to happen corre
 #[doc(hidden)]
 #[cfg(not(test))]
 mod std {
-    pub use core::kinds;
+    #[cfg(stage0)]
+    pub use core::markers as kinds;
+    pub use core::markers;
 }