From ebecec5bb183000712421a5411a432974f500332 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Thu, 2 Dec 2021 15:25:29 -0500 Subject: [PATCH] Minor examlpe tweaks * generates hello_world.txt.gz file - fixes #235 * highlights the difference between gzdecoder-bufread and -read examples --- .gitignore | 2 ++ examples/gzbuilder.rs | 4 ++-- examples/gzdecoder-bufread.rs | 5 ++--- examples/gzdecoder-read.rs | 5 ++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a9d37c560..3a4ef731c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ target Cargo.lock +examples/*.gz +.idea diff --git a/examples/gzbuilder.rs b/examples/gzbuilder.rs index 031683dec..d6ec2f4ce 100644 --- a/examples/gzbuilder.rs +++ b/examples/gzbuilder.rs @@ -6,14 +6,14 @@ use std::fs::File; use std::io; use std::io::prelude::*; -// Open file and debug print the contents compressed with gzip +// Compresses content of a text file into a gzip file fn main() { sample_builder().unwrap(); } // GzBuilder opens a file and writes a sample string using Builder pattern fn sample_builder() -> Result<(), io::Error> { - let f = File::create("examples/hello_world.gz")?; + let f = File::create("examples/hello_world.txt.gz")?; let mut gz = GzBuilder::new() .filename("hello_world.txt") .comment("test file, please delete") diff --git a/examples/gzdecoder-bufread.rs b/examples/gzdecoder-bufread.rs index 0702c174c..855119739 100644 --- a/examples/gzdecoder-bufread.rs +++ b/examples/gzdecoder-bufread.rs @@ -1,8 +1,7 @@ extern crate flate2; -use flate2::bufread::GzDecoder; use flate2::write::GzEncoder; -use flate2::Compression; +use flate2::{bufread, Compression}; use std::io; use std::io::prelude::*; @@ -17,7 +16,7 @@ fn main() { // Uncompresses a Gz Encoded vector of bytes and returns a string or error // Here &[u8] implements BufRead fn decode_reader(bytes: Vec) -> io::Result { - let mut gz = GzDecoder::new(&bytes[..]); + let mut gz = bufread::GzDecoder::new(&bytes[..]); let mut s = String::new(); gz.read_to_string(&mut s)?; Ok(s) diff --git a/examples/gzdecoder-read.rs b/examples/gzdecoder-read.rs index d8dcba367..705d28c2e 100644 --- a/examples/gzdecoder-read.rs +++ b/examples/gzdecoder-read.rs @@ -1,8 +1,7 @@ extern crate flate2; -use flate2::read::GzDecoder; use flate2::write::GzEncoder; -use flate2::Compression; +use flate2::{read, Compression}; use std::io; use std::io::prelude::*; @@ -17,7 +16,7 @@ fn main() { // Uncompresses a Gz Encoded vector of bytes and returns a string or error // Here &[u8] implements Read fn decode_reader(bytes: Vec) -> io::Result { - let mut gz = GzDecoder::new(&bytes[..]); + let mut gz = read::GzDecoder::new(&bytes[..]); let mut s = String::new(); gz.read_to_string(&mut s)?; Ok(s)