Skip to content

Move flate from core to std #6205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/libcore/core.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/metadata/encoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/metadata/loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions src/libcore/flate.rs → src/libstd/flate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions src/libstd/std.rc
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ pub mod complex;
pub mod stats;
pub mod semver;
pub mod fileinput;
pub mod flate;

#[cfg(unicode)]
mod unicode;
Expand Down