From 7652f3ddb8f3c4fd281e6ec0bd8fc0d9b8ed857b Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 2 May 2013 19:10:23 -0700 Subject: Move flate from core to std --- src/libcore/core.rc | 1 - src/libcore/flate.rs | 107 --------------------------------------- src/librustc/metadata/encoder.rs | 2 +- src/librustc/metadata/loader.rs | 2 +- src/libstd/flate.rs | 107 +++++++++++++++++++++++++++++++++++++++ src/libstd/std.rc | 1 + 6 files changed, 110 insertions(+), 110 deletions(-) delete mode 100644 src/libcore/flate.rs create mode 100644 src/libstd/flate.rs (limited to 'src') 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/libcore/flate.rs b/src/libcore/flate.rs deleted file mode 100644 index 29d0eb422d5..00000000000 --- a/src/libcore/flate.rs +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -/*! - -Simple compression - -*/ - -use libc; -use libc::{c_void, size_t, c_int}; -use vec; - -#[cfg(test)] use rand; -#[cfg(test)] use rand::RngUtil; - -pub mod rustrt { - use libc::{c_int, c_void, size_t}; - - #[link_name = "rustrt"] - pub extern { - unsafe fn tdefl_compress_mem_to_heap(psrc_buf: *const c_void, - src_buf_len: size_t, - pout_len: *mut size_t, - flags: c_int) - -> *c_void; - - unsafe fn tinfl_decompress_mem_to_heap(psrc_buf: *const c_void, - src_buf_len: size_t, - pout_len: *mut size_t, - flags: c_int) - -> *c_void; - } -} - -static lz_none : c_int = 0x0; // Huffman-coding only. -static lz_fast : c_int = 0x1; // LZ with only one probe -static lz_norm : c_int = 0x80; // LZ with 128 probes, "normal" -static lz_best : c_int = 0xfff; // LZ with 4095 probes, "best" - -pub fn deflate_bytes(bytes: &const [u8]) -> ~[u8] { - do vec::as_const_buf(bytes) |b, len| { - unsafe { - let mut outsz : size_t = 0; - let res = - rustrt::tdefl_compress_mem_to_heap(b as *c_void, - len as size_t, - &mut outsz, - lz_norm); - assert!(res as int != 0); - let out = vec::raw::from_buf_raw(res as *u8, - outsz as uint); - libc::free(res); - out - } - } -} - -pub fn inflate_bytes(bytes: &const [u8]) -> ~[u8] { - do vec::as_const_buf(bytes) |b, len| { - unsafe { - let mut outsz : size_t = 0; - let res = - rustrt::tinfl_decompress_mem_to_heap(b as *c_void, - len as size_t, - &mut outsz, - 0); - assert!(res as int != 0); - let out = vec::raw::from_buf_raw(res as *u8, - outsz as uint); - libc::free(res); - out - } - } -} - -#[test] -#[allow(non_implicitly_copyable_typarams)] -fn test_flate_round_trip() { - let mut r = rand::rng(); - let mut words = ~[]; - for 20.times { - let range = r.gen_uint_range(1, 10); - words.push(r.gen_bytes(range)); - } - for 20.times { - let mut in = ~[]; - for 2000.times { - in.push_all(r.choose(words)); - } - debug!("de/inflate of %u bytes of random word-sequences", - in.len()); - let cmp = deflate_bytes(in); - let out = inflate_bytes(cmp); - debug!("%u bytes deflated to %u (%.1f%% size)", - in.len(), cmp.len(), - 100.0 * ((cmp.len() as float) / (in.len() as float))); - assert!((in == out)); - } -} diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index 6c02ece9289..0c25111d129 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/libstd/flate.rs b/src/libstd/flate.rs new file mode 100644 index 00000000000..7485f2645bd --- /dev/null +++ b/src/libstd/flate.rs @@ -0,0 +1,107 @@ +// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +/*! + +Simple compression + +*/ + +use libc; +use core::libc::{c_void, size_t, c_int}; +use vec; + +#[cfg(test)] use core::rand; +#[cfg(test)] use core::rand::RngUtil; + +pub mod rustrt { + use core::libc::{c_int, c_void, size_t}; + + #[link_name = "rustrt"] + pub extern { + unsafe fn tdefl_compress_mem_to_heap(psrc_buf: *const c_void, + src_buf_len: size_t, + pout_len: *mut size_t, + flags: c_int) + -> *c_void; + + unsafe fn tinfl_decompress_mem_to_heap(psrc_buf: *const c_void, + src_buf_len: size_t, + pout_len: *mut size_t, + flags: c_int) + -> *c_void; + } +} + +static lz_none : c_int = 0x0; // Huffman-coding only. +static lz_fast : c_int = 0x1; // LZ with only one probe +static lz_norm : c_int = 0x80; // LZ with 128 probes, "normal" +static lz_best : c_int = 0xfff; // LZ with 4095 probes, "best" + +pub fn deflate_bytes(bytes: &const [u8]) -> ~[u8] { + do vec::as_const_buf(bytes) |b, len| { + unsafe { + let mut outsz : size_t = 0; + let res = + rustrt::tdefl_compress_mem_to_heap(b as *c_void, + len as size_t, + &mut outsz, + lz_norm); + assert!(res as int != 0); + let out = vec::raw::from_buf_raw(res as *u8, + outsz as uint); + libc::free(res); + out + } + } +} + +pub fn inflate_bytes(bytes: &const [u8]) -> ~[u8] { + do vec::as_const_buf(bytes) |b, len| { + unsafe { + let mut outsz : size_t = 0; + let res = + rustrt::tinfl_decompress_mem_to_heap(b as *c_void, + len as size_t, + &mut outsz, + 0); + assert!(res as int != 0); + let out = vec::raw::from_buf_raw(res as *u8, + outsz as uint); + libc::free(res); + out + } + } +} + +#[test] +#[allow(non_implicitly_copyable_typarams)] +fn test_flate_round_trip() { + let mut r = rand::rng(); + let mut words = ~[]; + for 20.times { + let range = r.gen_uint_range(1, 10); + words.push(r.gen_bytes(range)); + } + for 20.times { + let mut in = ~[]; + for 2000.times { + in.push_all(r.choose(words)); + } + debug!("de/inflate of %u bytes of random word-sequences", + in.len()); + let cmp = deflate_bytes(in); + let out = inflate_bytes(cmp); + debug!("%u bytes deflated to %u (%.1f%% size)", + in.len(), cmp.len(), + 100.0 * ((cmp.len() as float) / (in.len() as float))); + assert!((in == out)); + } +} 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; -- cgit 1.4.1-3-g733a5