From 7652f3ddb8f3c4fd281e6ec0bd8fc0d9b8ed857b Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 2 May 2013 19:10:23 -0700
Subject: [PATCH] Move flate from core to std

---
 src/libcore/core.rc              | 1 -
 src/librustc/metadata/encoder.rs | 2 +-
 src/librustc/metadata/loader.rs  | 2 +-
 src/{libcore => libstd}/flate.rs | 8 ++++----
 src/libstd/std.rc                | 1 +
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{libcore => libstd}/flate.rs (95%)

diff --git a/src/libcore/core.rc b/src/libcore/core.rc
index 3cc95e5a175ea..dcb61d4734169 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 6c02ece9289ae..0c25111d1291c 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 193f6fc8f0a3b..bad6e2a4ee5d7 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
similarity index 95%
rename from src/libcore/flate.rs
rename to src/libstd/flate.rs
index 29d0eb422d50a..7485f2645bdf2 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 7d013a20c67d7..70bd5ceef9887 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;