From e3b42c0c8596b6038f5e437390ac33d51b73f0d6 Mon Sep 17 00:00:00 2001 From: Mathijs van de Nes Date: Thu, 29 Jan 2015 11:04:38 +0100 Subject: [PATCH] Fix examples and tests --- examples/extract.rs | 16 +++++++++------- examples/extract_lorem.rs | 2 +- examples/write_sample.rs | 8 ++++---- src/reader.rs | 2 +- src/writer.rs | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/examples/extract.rs b/examples/extract.rs index 795bfcb6..6b4257c8 100644 --- a/examples/extract.rs +++ b/examples/extract.rs @@ -2,6 +2,8 @@ extern crate zip; +use std::old_io; + fn main() { let args = std::os::args(); @@ -11,7 +13,7 @@ fn main() return; } let fname = Path::new(&*args[1]); - let file = std::io::File::open(&fname).unwrap(); + let file = old_io::File::open(&fname).unwrap(); let zipcontainer = zip::ZipReader::new(file).unwrap(); @@ -23,7 +25,7 @@ fn main() let comment = &file.file_comment; if comment.len() > 0 { println!(" File comment: {}", comment); } - std::io::fs::mkdir_recursive(&outpath.dir_path(), std::io::USER_DIR).unwrap(); + old_io::fs::mkdir_recursive(&outpath.dir_path(), old_io::USER_DIR).unwrap(); if (&*file.file_name).ends_with("/") { create_directory(outpath); @@ -34,17 +36,17 @@ fn main() } } -fn write_file(zipcontainer: &zip::ZipReader, file: &zip::ZipFile, outpath: Path) +fn write_file(zipcontainer: &zip::ZipReader, file: &zip::ZipFile, outpath: Path) { - let mut outfile = std::io::File::create(&outpath); + let mut outfile = old_io::File::create(&outpath); let mut reader = zipcontainer.read_file(file).unwrap(); - std::io::util::copy(&mut reader, &mut outfile).unwrap(); - std::io::fs::chmod(&outpath, std::io::USER_FILE).unwrap(); + old_io::util::copy(&mut reader, &mut outfile).unwrap(); + old_io::fs::chmod(&outpath, old_io::USER_FILE).unwrap(); } fn create_directory(outpath: Path) { - std::io::fs::mkdir_recursive(&outpath, std::io::USER_DIR).unwrap(); + old_io::fs::mkdir_recursive(&outpath, old_io::USER_DIR).unwrap(); } fn sanitize_filename(filename: &str) -> Path diff --git a/examples/extract_lorem.rs b/examples/extract_lorem.rs index b790a0e5..3f2b3eb8 100644 --- a/examples/extract_lorem.rs +++ b/examples/extract_lorem.rs @@ -11,7 +11,7 @@ fn main() return; } let fname = Path::new(&*args[1]); - let file = std::io::File::open(&fname).unwrap(); + let file = std::old_io::File::open(&fname).unwrap(); let zipcontainer = zip::ZipReader::new(file).unwrap(); diff --git a/examples/write_sample.rs b/examples/write_sample.rs index 5be6b467..52e94716 100644 --- a/examples/write_sample.rs +++ b/examples/write_sample.rs @@ -22,23 +22,23 @@ fn main() fn doit(filename: &str) -> zip::result::ZipResult<()> { let path = Path::new(filename); - let file = std::io::File::create(&path).unwrap(); + let file = std::old_io::File::create(&path).unwrap(); let mut zip = zip::ZipWriter::new(file); try!(zip.start_file("test/", zip::CompressionMethod::Stored)); try!(zip.start_file("test/☃.txt", zip::CompressionMethod::Stored)); - try!(zip.write(b"Hello, World!\n")); + try!(zip.write_all(b"Hello, World!\n")); try!(zip.start_file("test/lorem_ipsum.txt", zip::CompressionMethod::Deflated)); - try!(zip.write(LOREM_IPSUM)); + try!(zip.write_all(LOREM_IPSUM)); try!(zip.finish()); Ok(()) } -static LOREM_IPSUM : &'static [u8] = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tellus elit, tristique vitae mattis egestas, ultricies vitae risus. Quisque sit amet quam ut urna aliquet +const LOREM_IPSUM : &'static [u8] = b"Lorem ipsum dolor sit amet, consectetur adipiscing elit. In tellus elit, tristique vitae mattis egestas, ultricies vitae risus. Quisque sit amet quam ut urna aliquet molestie. Proin blandit ornare dui, a tempor nisl accumsan in. Praesent a consequat felis. Morbi metus diam, auctor in auctor vel, feugiat id odio. Curabitur ex ex, dictum quis auctor quis, suscipit id lorem. Aliquam vestibulum dolor nec enim vehicula, porta tristique augue tincidunt. Vivamus ut gravida est. Sed pellentesque, dolor vitae tristique consectetur, neque lectus pulvinar dui, sed feugiat purus diam id lectus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per diff --git a/src/reader.rs b/src/reader.rs index de5f725c..d161776e 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -18,7 +18,7 @@ use bzip2::reader::BzDecompressor; /// // For demonstration purposes we read from an empty buffer. /// // Normally a File object would be used. /// let buf = [0u8; 128]; -/// let mut reader = std::io::BufReader::new(&buf); +/// let mut reader = std::old_io::BufReader::new(&buf); /// /// let zip = try!(zip::ZipReader::new(reader)); /// diff --git a/src/writer.rs b/src/writer.rs index 691e02af..bb1dc258 100644 --- a/src/writer.rs +++ b/src/writer.rs @@ -29,11 +29,11 @@ enum GenericZipWriter /// { /// // For this example we write to a buffer, but normally you should use a File /// let mut buf = [0u8; 65536]; -/// let w = std::io::BufWriter::new(&mut buf); +/// let w = std::old_io::BufWriter::new(&mut buf); /// let mut zip = zip::ZipWriter::new(w); /// /// try!(zip.start_file("hello_world.txt", zip::CompressionMethod::Stored)); -/// try!(zip.write(b"Hello, World!")); +/// try!(zip.write_all(b"Hello, World!")); /// /// // Optionally finish the zip. (this is also done on drop) /// try!(zip.finish());