Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7652f3d

Browse files
committedMay 10, 2013
Move flate from core to std
1 parent d546493 commit 7652f3d

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed
 

‎src/libcore/core.rc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ pub mod rand;
228228
pub mod run;
229229
pub mod sys;
230230
pub mod cast;
231-
pub mod flate;
232231
pub mod repr;
233232
pub mod cleanup;
234233
pub mod reflect;

‎src/librustc/metadata/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use middle::ty;
2020
use middle;
2121
use util::ppaux::ty_to_str;
2222

23-
use core::flate;
23+
use std::flate;
2424
use core::hash::HashUtil;
2525
use core::hashmap::HashMap;
2626
use std::serialize::Encodable;

‎src/librustc/metadata/loader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use syntax::parse::token::ident_interner;
2222
use syntax::print::pprust;
2323
use syntax::{ast, attr};
2424

25-
use core::flate;
25+
use std::flate;
2626
use core::os::consts::{macos, freebsd, linux, android, win32};
2727

2828
pub enum os {

‎src/libcore/flate.rs renamed to ‎src/libstd/flate.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ Simple compression
1515
*/
1616

1717
use libc;
18-
use libc::{c_void, size_t, c_int};
18+
use core::libc::{c_void, size_t, c_int};
1919
use vec;
2020

21-
#[cfg(test)] use rand;
22-
#[cfg(test)] use rand::RngUtil;
21+
#[cfg(test)] use core::rand;
22+
#[cfg(test)] use core::rand::RngUtil;
2323

2424
pub mod rustrt {
25-
use libc::{c_int, c_void, size_t};
25+
use core::libc::{c_int, c_void, size_t};
2626

2727
#[link_name = "rustrt"]
2828
pub extern {

‎src/libstd/std.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ pub mod complex;
107107
pub mod stats;
108108
pub mod semver;
109109
pub mod fileinput;
110+
pub mod flate;
110111

111112
#[cfg(unicode)]
112113
mod unicode;

5 commit comments

Comments
 (5)

bors commented on May 11, 2013

@bors
Collaborator

saw approval from brson
at brson@7652f3d

bors commented on May 11, 2013

@bors
Collaborator

merging brson/rust/flate = 7652f3d into auto

bors commented on May 11, 2013

@bors
Collaborator

brson/rust/flate = 7652f3d merged ok, testing candidate = c49cf8b

bors commented on May 11, 2013

@bors
Collaborator

fast-forwarding incoming to auto = c49cf8b

Please sign in to comment.