Update to secrecy 0.10.

Author: tmpfs

Cargo.lock

@@ -14,6 +14,6 @@ edition = "2018"
 log = "0.4"
 nom = { version = "7", default-features = false }
 percent-encoding = "2.1"
-secrecy = "0.8"
+secrecy = "0.10"
 which = { version = "4", default-features = false }
 zeroize = "1"

Cargo.toml

@@ -148,7 +148,13 @@ impl Connection {
                     let buf = data.take();
                     let data_line_decoded =
                         percent_decode_str(data_line.expose_secret()).decode_utf8()?;
-                    data = Some(buf.unwrap_or_else(String::new) + &data_line_decoded);
+
+                    let mut s = buf
+                        .unwrap_or_else(|| String::new().into_boxed_str())
+                        .to_string();
+                    s.push_str(data_line_decoded.as_ref());
+                    data = Some(s.into_boxed_str());
+
                     if let Cow::Owned(mut data_line_decoded) = data_line_decoded {
                         data_line_decoded.zeroize();
                     }
@@ -174,7 +180,6 @@ mod read {
         sequence::{pair, preceded, terminated},
         IResult,
     };
-    use secrecy::SecretString;
 
     use super::Response;
 
@@ -224,7 +229,7 @@ mod read {
                 preceded(
                     tag("D "),
                     map(is_not("\r\n"), |data: &str| {
-                        Response::DataLine(SecretString::new(data.to_owned()))
+                        Response::DataLine(data.to_owned().into())
                     }),
                 ),
                 preceded(

src/assuan.rs

@@ -18,7 +18,7 @@
 //!         .interact()
 //! } else {
 //!     // Fall back to some other passphrase entry method.
-//!     Ok(SecretString::new("a better passphrase than this".to_owned()))
+//!     Ok("a better passphrase than this".to_owned().into())
 //! }?;
 //! # Ok::<(), pinentry::Error>(())
 //! ```
@@ -239,7 +239,7 @@ impl<'a> PassphraseInput<'a> {
         loop {
             match (pinentry.send_request("GETPIN", None)?, self.required) {
                 // If the user provides an empty passphrase, GETPIN returns no data.
-                (None, None) => return Ok(SecretString::new(String::new())),
+                (None, None) => return Ok(String::new().into()),
                 (Some(passphrase), _) => return Ok(passphrase),
                 (_, Some(empty_error)) => {
                     // SETERROR is cleared by GETPIN, so we reset it on each loop.