autocrypt, net: openpgp: Rewrite all usages of `Reader::new`.

5 files changed, 31 insertions, 31 deletions

diff --git a/openpgp/src/armor.rs b/openpgp/src/armor.rs
index c7c500cd..caca521b 100644
--- a/openpgp/src/armor.rs
+++ b/openpgp/src/armor.rs
@@ -24,7 +24,7 @@
 //! use openpgp::armor::{Reader, ReaderMode, Kind};
 //!
 //! let mut file = File::open("somefile.asc")?;
-//! let mut r = Reader::new(&mut file, ReaderMode::Tolerant(Some(Kind::File)));
+//! let mut r = Reader::from_reader(&mut file, ReaderMode::Tolerant(Some(Kind::File)));
 //! # Ok(()) }
 //! ```
 
@@ -650,7 +650,7 @@ impl<'a> Reader<'a> {
     /// let data = "yxJiAAAAAABIZWxsbyB3b3JsZCE="; // base64 over literal data packet
     ///
     /// let mut cursor = io::Cursor::new(&data);
-    /// let mut reader = Reader::new(&mut cursor, ReaderMode::VeryTolerant);
+    /// let mut reader = Reader::from_reader(&mut cursor, ReaderMode::VeryTolerant);
     ///
     /// let mut buf = Vec::new();
     /// reader.read_to_end(&mut buf)?;
@@ -678,7 +678,7 @@ impl<'a> Reader<'a> {
     ///      -----END PGP ARMORED FILE-----";
     ///
     /// let mut cursor = io::Cursor::new(&data);
-    /// let mut reader = Reader::new(&mut cursor, ReaderMode::Tolerant(Some(Kind::File)));
+    /// let mut reader = Reader::from_reader(&mut cursor, ReaderMode::Tolerant(Some(Kind::File)));
     ///
     /// let mut content = String::new();
     /// reader.read_to_string(&mut content)?;
@@ -794,7 +794,7 @@ impl<'a> Reader<'a> {
     ///      -----END PGP ARMORED FILE-----";
     ///
     /// let mut cursor = io::Cursor::new(&data);
-    /// let mut reader = Reader::new(&mut cursor, ReaderMode::Tolerant(Some(Kind::File)));
+    /// let mut reader = Reader::from_reader(&mut cursor, ReaderMode::Tolerant(Some(Kind::File)));
     ///
     /// let mut content = String::new();
     /// reader.read_to_string(&mut content)?;
@@ -1173,8 +1173,8 @@ impl<'a> Reader<'a> {
             //     of data.
             //
             //     Note: this happens if the caller does `for c in
-            //     Reader::new(...).bytes() ...`.  Then it reads one
-            //     byte of decoded data at a time.
+            //     Reader::from_reader(...).bytes() ...`.  Then it
+            //     reads one byte of decoded data at a time.
             //
             //   - Small: if the caller only requests a few bytes at a
             //     time, we may as well double buffer to reduce
@@ -1871,7 +1871,7 @@ mod test {
                           LITERAL_NO_HEADER_WITH_CHKSUM_ASC[i],
                           LITERAL_NO_HEADER_ASC[i],
                           LITERAL_NO_NEWLINES_ASC[i]] {
-                let mut r = Reader::new(Cursor::new(test),
+                let mut r = Reader::from_reader(Cursor::new(test),
                                         ReaderMode::VeryTolerant);
                 let mut dearmored = Vec::<u8>::new();
                 r.read_to_end(&mut dearmored).unwrap();
@@ -1884,7 +1884,7 @@ mod test {
     #[test]
     fn dearmor_binary() {
         for bin in TEST_BIN.iter() {
-            let mut r = Reader::new(
+            let mut r = Reader::from_reader(
                 Cursor::new(bin), ReaderMode::Tolerant(Some(Kind::Message)));
             let mut buf = [0; 5];
             let e = r.read(&mut buf);
@@ -1894,7 +1894,7 @@ mod test {
 
     #[test]
     fn dearmor_wrong_kind() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(&include_bytes!("../tests/data/armor/test-0.asc")[..]),
             ReaderMode::Tolerant(Some(Kind::Message)));
         let mut buf = [0; 5];
@@ -1904,7 +1904,7 @@ mod test {
 
     #[test]
     fn dearmor_wrong_crc() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(
                 &include_bytes!("../tests/data/armor/test-0.bad-crc.asc")[..]),
             ReaderMode::Tolerant(Some(Kind::File)));
@@ -1920,7 +1920,7 @@ mod test {
 
     #[test]
     fn dearmor_wrong_footer() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(
                 &include_bytes!("../tests/data/armor/test-2.bad-footer.asc")[..]
             ),
@@ -1939,7 +1939,7 @@ mod test {
 
     #[test]
     fn dearmor_no_crc() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(
                 &include_bytes!("../tests/data/armor/test-1.no-crc.asc")[..]),
             ReaderMode::Tolerant(Some(Kind::File)));
@@ -1950,7 +1950,7 @@ mod test {
 
     #[test]
     fn dearmor_with_header() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(
                 &include_bytes!("../tests/data/armor/test-3.with-headers.asc")[..]
             ),
@@ -1967,7 +1967,7 @@ mod test {
 
     #[test]
     fn dearmor_any() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(
                 &include_bytes!("../tests/data/armor/test-3.with-headers.asc")[..]
             ),
@@ -1987,7 +1987,7 @@ mod test {
         // Slap some garbage in front and make sure it still reads ok.
         let mut b: Vec<u8> = "Some\ngarbage\nlines\n\t\r  ".into();
         b.extend_from_slice(armored);
-        let mut r = Reader::new(Cursor::new(b), ReaderMode::VeryTolerant);
+        let mut r = Reader::from_reader(Cursor::new(b), ReaderMode::VeryTolerant);
         let mut buf = [0; 5];
         let e = r.read(&mut buf);
         assert_eq!(r.kind(), Some(Kind::File));
@@ -1999,7 +1999,7 @@ mod test {
         // line of the header.
         let mut b: Vec<u8> = "Some\ngarbage\nlines\n\t.\r  ".into();
         b.extend_from_slice(armored);
-        let mut r = Reader::new(Cursor::new(b), ReaderMode::VeryTolerant);
+        let mut r = Reader::from_reader(Cursor::new(b), ReaderMode::VeryTolerant);
         let mut buf = [0; 5];
         let e = r.read(&mut buf);
         assert!(e.is_err());
@@ -2008,7 +2008,7 @@ mod test {
     #[test]
     fn dearmor() {
         for (bin, asc) in TEST_BIN.iter().zip(TEST_ASC.iter()) {
-            let mut r = Reader::new(
+            let mut r = Reader::from_reader(
                 Cursor::new(asc),
                 ReaderMode::Tolerant(Some(Kind::File)));
             let mut dearmored = Vec::<u8>::new();
@@ -2021,7 +2021,7 @@ mod test {
     #[test]
     fn dearmor_bytewise() {
         for (bin, asc) in TEST_BIN.iter().zip(TEST_ASC.iter()) {
-            let r = Reader::new(
+            let r = Reader::from_reader(
                 Cursor::new(asc),
                 ReaderMode::Tolerant(Some(Kind::File)));
             let mut dearmored = Vec::<u8>::new();
@@ -2036,12 +2036,12 @@ mod test {
     #[test]
     fn dearmor_yuge() {
         let yuge_key = crate::tests::key("yuge-key-so-yuge-the-yugest.asc");
-        let mut r = Reader::new(Cursor::new(yuge_key),
+        let mut r = Reader::from_reader(Cursor::new(yuge_key),
                                 ReaderMode::VeryTolerant);
         let mut dearmored = Vec::<u8>::new();
         r.read_to_end(&mut dearmored).unwrap();
 
-        let r = Reader::new(Cursor::new(yuge_key),
+        let r = Reader::from_reader(Cursor::new(yuge_key),
                             ReaderMode::VeryTolerant);
         let mut dearmored = Vec::<u8>::new();
         for c in r.bytes() {
@@ -2051,7 +2051,7 @@ mod test {
 
     #[test]
     fn dearmor_quoted() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(
                 &include_bytes!("../tests/data/armor/test-3.with-headers-quoted.asc")[..]
             ),
@@ -2066,7 +2066,7 @@ mod test {
 
     #[test]
     fn dearmor_quoted_stripped() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(
                 &include_bytes!("../tests/data/armor/test-3.with-headers-quoted-stripped.asc")[..]
             ),
@@ -2081,7 +2081,7 @@ mod test {
 
     #[test]
     fn dearmor_quoted_a_lot() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(
                 &include_bytes!("../tests/data/armor/test-3.with-headers-quoted-a-lot.asc")[..]
             ),
@@ -2096,7 +2096,7 @@ mod test {
 
     #[test]
     fn dearmor_quoted_badly() {
-        let mut r = Reader::new(
+        let mut r = Reader::from_reader(
             Cursor::new(
                 &include_bytes!("../tests/data/armor/test-3.with-headers-quoted-badly.asc")[..]
             ),
@@ -2120,13 +2120,13 @@ mod test {
             let encoded = w.finalize().unwrap();
 
             let mut recovered = Vec::new();
-            Reader::new(Cursor::new(&encoded),
+            Reader::from_reader(Cursor::new(&encoded),
                         ReaderMode::Tolerant(Some(kind)))
                 .read_to_end(&mut recovered)
                 .unwrap();
 
             let mut recovered_any = Vec::new();
-            Reader::new(Cursor::new(&encoded), ReaderMode::VeryTolerant)
+            Reader::from_reader(Cursor::new(&encoded), ReaderMode::VeryTolerant)
                 .read_to_end(&mut recovered_any)
                 .unwrap();
 
diff --git a/openpgp/src/cert.rs b/openpgp/src/cert.rs
index eb8363cc..f31fa82a 100644
--- a/openpgp/src/cert.rs
+++ b/openpgp/src/cert.rs
@@ -4255,7 +4255,7 @@ mod test {
         let cert = Cert::from_bytes(crate::tests::key("already-revoked.pgp")).unwrap();
 
         let rev = crate::tests::key("already-revoked.rev");
-        let rev = PacketPile::from_reader(armor::Reader::new(rev, None))
+        let rev = PacketPile::from_reader(armor::Reader::from_reader(rev, None))
             .unwrap();
 
         let rev : Vec<Packet> = rev.into_children().collect();
diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs
index 1834373b..5501d031 100644
--- a/openpgp/src/message/mod.rs
+++ b/openpgp/src/message/mod.rs
@@ -399,7 +399,7 @@ impl Message {
     /// let data = "yxJiAAAAAABIZWxsbyB3b3JsZCE="; // base64 over literal data packet
     ///
     /// let mut cursor = io::Cursor::new(&data);
-    /// let mut reader = Reader::new(&mut cursor, ReaderMode::VeryTolerant);
+    /// let mut reader = Reader::from_reader(&mut cursor, ReaderMode::VeryTolerant);
     ///
     /// let mut buf = Vec::new();
     /// reader.read_to_end(&mut buf)?;
diff --git a/openpgp/src/policy.rs b/openpgp/src/policy.rs
index 20b17162..c500247e 100644
--- a/openpgp/src/policy.rs
+++ b/openpgp/src/policy.rs
@@ -540,7 +540,7 @@ impl Default for HashAlgoSecurity {
 /// "#;
 ///
 /// let mut cursor = Cursor::new(&data);
-/// let mut reader = Reader::new(&mut cursor, ReaderMode::Tolerant(Some(Kind::PublicKey)));
+/// let mut reader = Reader::from_reader(&mut cursor, ReaderMode::Tolerant(Some(Kind::PublicKey)));
 ///
 /// let mut buf = Vec::new();
 /// reader.read_to_end(&mut buf)?;
diff --git a/openpgp/src/serialize/cert_armored.rs b/openpgp/src/serialize/cert_armored.rs
index 65b4dd25..a3060e8d 100644
--- a/openpgp/src/serialize/cert_armored.rs
+++ b/openpgp/src/serialize/cert_armored.rs
@@ -270,7 +270,7 @@ mod tests {
 
         // Parse the armor.
         let mut cursor = io::Cursor::new(&buffer);
-        let mut reader = Reader::new(
+        let mut reader = Reader::from_reader(
             &mut cursor, ReaderMode::Tolerant(Some(Kind::PublicKey)));
 
         // Extract the headers.
@@ -345,7 +345,7 @@ mod tests {
 
         // Parse the armor.
         let mut cursor = io::Cursor::new(&buffer);
-        let mut reader = Reader::new(
+        let mut reader = Reader::from_reader(
             &mut cursor, ReaderMode::Tolerant(Some(Kind::PublicKey)));
 
         // Extract the headers.