about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorMichael McConville <mmcco@mykolab.com>2015-12-18 22:37:00 -0500
committerMichael McConville <mmcco@mykolab.com>2015-12-18 22:37:00 -0500
commite8d2706cbac46eac7f4cd1554c41c748e00a4a00 (patch)
tree556cad53a8d415b3b3a660d756d3bc20bf1609cb /src/libstd/lib.rs
parent33113f86f4c4f191d1bf42642b1a7714c576e395 (diff)
parent8ad12c3e251df6b8ed42b4d32709f4f55470a0be (diff)
downloadrust-e8d2706cbac46eac7f4cd1554c41c748e00a4a00.tar.gz
rust-e8d2706cbac46eac7f4cd1554c41c748e00a4a00.zip
Merge branch 'master' of https://github.com/rust-lang/rust
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 0f8b2f6e17b..eba0c799cd2 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -248,6 +248,7 @@
 #![feature(link_args)]
 #![feature(linkage)]
 #![feature(macro_reexport)]
+#![feature(num_bits_bytes)]
 #![feature(on_unimplemented)]
 #![feature(oom)]
 #![feature(optin_builtin_traits)]
@@ -429,6 +430,7 @@ pub mod path;
 pub mod process;
 pub mod sync;
 pub mod time;
+mod memchr;
 
 #[macro_use]
 #[path = "sys/common/mod.rs"] mod sys_common;