Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

24 files changed, 23 insertions, 44 deletions

diff --git a/vendor/flate2/examples/compress_file.rs b/vendor/flate2/examples/compress_file.rs
index 39ed8eed4..be4b81e69 100644
--- a/vendor/flate2/examples/compress_file.rs
+++ b/vendor/flate2/examples/compress_file.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::write::GzEncoder;
 use flate2::Compression;
 use std::env::args;
diff --git a/vendor/flate2/examples/decompress_file.rs b/vendor/flate2/examples/decompress_file.rs
new file mode 100644
index 000000000..6b2ede95c
--- /dev/null
+++ b/vendor/flate2/examples/decompress_file.rs
@@ -0,0 +1,23 @@
+use flate2::bufread;
+use std::env::args;
+use std::fs::File;
+use std::io::copy;
+use std::io::BufReader;
+use std::time::Instant;
+
+fn main() {
+    // E.g. `cargo run --example decompress_file examples/hello_world.txt.gz hello_world.txt`
+    if args().len() != 3 {
+        eprintln!("Usage: ./decompress_file `source` `target`");
+        return;
+    }
+    let input = BufReader::new(File::open(args().nth(1).unwrap()).unwrap());
+    let mut output = File::create(args().nth(2).unwrap()).unwrap();
+    let source_len = input.get_ref().metadata().unwrap().len();
+    let start = Instant::now();
+    let mut decoder = bufread::GzDecoder::new(input);
+    copy(&mut decoder, &mut output).unwrap();
+    println!("Source len: {:?}", source_len);
+    println!("Target len: {:?}", output.metadata().unwrap().len());
+    println!("Elapsed: {:?}", start.elapsed());
+}
diff --git a/vendor/flate2/examples/deflatedecoder-bufread.rs b/vendor/flate2/examples/deflatedecoder-bufread.rs
index 7d1cb6fd9..6b8e7fea1 100644
--- a/vendor/flate2/examples/deflatedecoder-bufread.rs
+++ b/vendor/flate2/examples/deflatedecoder-bufread.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::bufread::DeflateDecoder;
 use flate2::write::DeflateEncoder;
 use flate2::Compression;
diff --git a/vendor/flate2/examples/deflatedecoder-read.rs b/vendor/flate2/examples/deflatedecoder-read.rs
index cc5d435be..1bc83bc3c 100644
--- a/vendor/flate2/examples/deflatedecoder-read.rs
+++ b/vendor/flate2/examples/deflatedecoder-read.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::read::DeflateDecoder;
 use flate2::write::DeflateEncoder;
 use flate2::Compression;
diff --git a/vendor/flate2/examples/deflatedecoder-write.rs b/vendor/flate2/examples/deflatedecoder-write.rs
index 276490bac..b9ba7a319 100644
--- a/vendor/flate2/examples/deflatedecoder-write.rs
+++ b/vendor/flate2/examples/deflatedecoder-write.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::write::DeflateDecoder;
 use flate2::write::DeflateEncoder;
 use flate2::Compression;
diff --git a/vendor/flate2/examples/deflateencoder-bufread.rs b/vendor/flate2/examples/deflateencoder-bufread.rs
index 6240f3997..bff1848c3 100644
--- a/vendor/flate2/examples/deflateencoder-bufread.rs
+++ b/vendor/flate2/examples/deflateencoder-bufread.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::bufread::DeflateEncoder;
 use flate2::Compression;
 use std::fs::File;
diff --git a/vendor/flate2/examples/deflateencoder-read.rs b/vendor/flate2/examples/deflateencoder-read.rs
index ffb628e48..366c60c99 100644
--- a/vendor/flate2/examples/deflateencoder-read.rs
+++ b/vendor/flate2/examples/deflateencoder-read.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::read::DeflateEncoder;
 use flate2::Compression;
 use std::io;
diff --git a/vendor/flate2/examples/deflateencoder-write.rs b/vendor/flate2/examples/deflateencoder-write.rs
index 243b9dfdd..f998e1aec 100644
--- a/vendor/flate2/examples/deflateencoder-write.rs
+++ b/vendor/flate2/examples/deflateencoder-write.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::write::DeflateEncoder;
 use flate2::Compression;
 use std::io::prelude::*;
diff --git a/vendor/flate2/examples/gzbuilder.rs b/vendor/flate2/examples/gzbuilder.rs
index d6ec2f4ce..c07250851 100644
--- a/vendor/flate2/examples/gzbuilder.rs
+++ b/vendor/flate2/examples/gzbuilder.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::Compression;
 use flate2::GzBuilder;
 use std::fs::File;
diff --git a/vendor/flate2/examples/gzdecoder-bufread.rs b/vendor/flate2/examples/gzdecoder-bufread.rs
index 855119739..06d0448da 100644
--- a/vendor/flate2/examples/gzdecoder-bufread.rs
+++ b/vendor/flate2/examples/gzdecoder-bufread.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::write::GzEncoder;
 use flate2::{bufread, Compression};
 use std::io;
diff --git a/vendor/flate2/examples/gzdecoder-read.rs b/vendor/flate2/examples/gzdecoder-read.rs
index 705d28c2e..fbd05be72 100644
--- a/vendor/flate2/examples/gzdecoder-read.rs
+++ b/vendor/flate2/examples/gzdecoder-read.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::write::GzEncoder;
 use flate2::{read, Compression};
 use std::io;
diff --git a/vendor/flate2/examples/gzdecoder-write.rs b/vendor/flate2/examples/gzdecoder-write.rs
index 766bb5e75..6cee8f8d7 100644
--- a/vendor/flate2/examples/gzdecoder-write.rs
+++ b/vendor/flate2/examples/gzdecoder-write.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::write::{GzDecoder, GzEncoder};
 use flate2::Compression;
 use std::io;
diff --git a/vendor/flate2/examples/gzencoder-bufread.rs b/vendor/flate2/examples/gzencoder-bufread.rs
index 015ae0a82..2214e2dcd 100644
--- a/vendor/flate2/examples/gzencoder-bufread.rs
+++ b/vendor/flate2/examples/gzencoder-bufread.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::bufread::GzEncoder;
 use flate2::Compression;
 use std::fs::File;
diff --git a/vendor/flate2/examples/gzencoder-read.rs b/vendor/flate2/examples/gzencoder-read.rs
index 3f1262b99..ee1384833 100644
--- a/vendor/flate2/examples/gzencoder-read.rs
+++ b/vendor/flate2/examples/gzencoder-read.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::read::GzEncoder;
 use flate2::Compression;
 use std::io;
diff --git a/vendor/flate2/examples/gzencoder-write.rs b/vendor/flate2/examples/gzencoder-write.rs
index 275b010c5..cee01d14a 100644
--- a/vendor/flate2/examples/gzencoder-write.rs
+++ b/vendor/flate2/examples/gzencoder-write.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::write::GzEncoder;
 use flate2::Compression;
 use std::io::prelude::*;
diff --git a/vendor/flate2/examples/gzmultidecoder-bufread.rs b/vendor/flate2/examples/gzmultidecoder-bufread.rs
index c6bb2c550..692b6f532 100644
--- a/vendor/flate2/examples/gzmultidecoder-bufread.rs
+++ b/vendor/flate2/examples/gzmultidecoder-bufread.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::bufread::MultiGzDecoder;
 use flate2::write::GzEncoder;
 use flate2::Compression;
diff --git a/vendor/flate2/examples/gzmultidecoder-read.rs b/vendor/flate2/examples/gzmultidecoder-read.rs
index 7c8a8e316..c59561dde 100644
--- a/vendor/flate2/examples/gzmultidecoder-read.rs
+++ b/vendor/flate2/examples/gzmultidecoder-read.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::read::MultiGzDecoder;
 use flate2::write::GzEncoder;
 use flate2::Compression;
diff --git a/vendor/flate2/examples/hello_world.txt.gz b/vendor/flate2/examples/hello_world.txt.gz
new file mode 100644
index 000000000..bab979960
--- /dev/null
+++ b/vendor/flate2/examples/hello_world.txt.gz
diff --git a/vendor/flate2/examples/zlibdecoder-bufread.rs b/vendor/flate2/examples/zlibdecoder-bufread.rs
index 30f168a7b..82620c54b 100644
--- a/vendor/flate2/examples/zlibdecoder-bufread.rs
+++ b/vendor/flate2/examples/zlibdecoder-bufread.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::bufread::ZlibDecoder;
 use flate2::write::ZlibEncoder;
 use flate2::Compression;
diff --git a/vendor/flate2/examples/zlibdecoder-read.rs b/vendor/flate2/examples/zlibdecoder-read.rs
index f7e5fb0af..3d4cda7d9 100644
--- a/vendor/flate2/examples/zlibdecoder-read.rs
+++ b/vendor/flate2/examples/zlibdecoder-read.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::read::ZlibDecoder;
 use flate2::write::ZlibEncoder;
 use flate2::Compression;
diff --git a/vendor/flate2/examples/zlibdecoder-write.rs b/vendor/flate2/examples/zlibdecoder-write.rs
index 358e9035b..7f5afbea1 100644
--- a/vendor/flate2/examples/zlibdecoder-write.rs
+++ b/vendor/flate2/examples/zlibdecoder-write.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::write::ZlibDecoder;
 use flate2::write::ZlibEncoder;
 use flate2::Compression;
diff --git a/vendor/flate2/examples/zlibencoder-bufread.rs b/vendor/flate2/examples/zlibencoder-bufread.rs
index 0321d8d38..e5e17f52e 100644
--- a/vendor/flate2/examples/zlibencoder-bufread.rs
+++ b/vendor/flate2/examples/zlibencoder-bufread.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::bufread::ZlibEncoder;
 use flate2::Compression;
 use std::fs::File;
diff --git a/vendor/flate2/examples/zlibencoder-read.rs b/vendor/flate2/examples/zlibencoder-read.rs
index 779eb1d31..f833a50bd 100644
--- a/vendor/flate2/examples/zlibencoder-read.rs
+++ b/vendor/flate2/examples/zlibencoder-read.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::read::ZlibEncoder;
 use flate2::Compression;
 use std::fs::File;
diff --git a/vendor/flate2/examples/zlibencoder-write.rs b/vendor/flate2/examples/zlibencoder-write.rs
index 76bcf17b1..3e3548f01 100644
--- a/vendor/flate2/examples/zlibencoder-write.rs
+++ b/vendor/flate2/examples/zlibencoder-write.rs
@@ -1,5 +1,3 @@
-extern crate flate2;
-
 use flate2::write::ZlibEncoder;
 use flate2::Compression;
 use std::io::prelude::*;