auto merge of #6205 : brson/rust/flate, r=brson

r? @graydon

I don't think this is necessary in core.

5 files changed, 7 insertions, 7 deletions

diff --git a/src/libcore/core.rc b/src/libcore/core.rc
index 3cc95e5a175..dcb61d47341 100644
--- a/src/libcore/core.rc
+++ b/src/libcore/core.rc
@@ -228,7 +228,6 @@ pub mod rand;
 pub mod run;
 pub mod sys;
 pub mod cast;
-pub mod flate;
 pub mod repr;
 pub mod cleanup;
 pub mod reflect;
diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs
index 7d25d5f3ec9..2666c52f1ee 100644
--- a/src/librustc/metadata/encoder.rs
+++ b/src/librustc/metadata/encoder.rs
@@ -20,7 +20,7 @@ use middle::ty;
 use middle;
 use util::ppaux::ty_to_str;
 
-use core::flate;
+use std::flate;
 use core::hash::HashUtil;
 use core::hashmap::HashMap;
 use std::serialize::Encodable;
diff --git a/src/librustc/metadata/loader.rs b/src/librustc/metadata/loader.rs
index 193f6fc8f0a..bad6e2a4ee5 100644
--- a/src/librustc/metadata/loader.rs
+++ b/src/librustc/metadata/loader.rs
@@ -22,7 +22,7 @@ use syntax::parse::token::ident_interner;
 use syntax::print::pprust;
 use syntax::{ast, attr};
 
-use core::flate;
+use std::flate;
 use core::os::consts::{macos, freebsd, linux, android, win32};
 
 pub enum os {
diff --git a/src/libcore/flate.rs b/src/libstd/flate.rs
index 29d0eb422d5..7485f2645bd 100644
--- a/src/libcore/flate.rs
+++ b/src/libstd/flate.rs
@@ -15,14 +15,14 @@ Simple compression
 */
 
 use libc;
-use libc::{c_void, size_t, c_int};
+use core::libc::{c_void, size_t, c_int};
 use vec;
 
-#[cfg(test)] use rand;
-#[cfg(test)] use rand::RngUtil;
+#[cfg(test)] use core::rand;
+#[cfg(test)] use core::rand::RngUtil;
 
 pub mod rustrt {
-    use libc::{c_int, c_void, size_t};
+    use core::libc::{c_int, c_void, size_t};
 
     #[link_name = "rustrt"]
     pub extern {
diff --git a/src/libstd/std.rc b/src/libstd/std.rc
index 7d013a20c67..70bd5ceef98 100644
--- a/src/libstd/std.rc
+++ b/src/libstd/std.rc
@@ -107,6 +107,7 @@ pub mod complex;
 pub mod stats;
 pub mod semver;
 pub mod fileinput;
+pub mod flate;
 
 #[cfg(unicode)]
 mod unicode;