diff options
| -rw-r--r-- | autocrypt/src/lib.rs | 4 | ||||
| -rw-r--r-- | net/src/wkd.rs | 6 | ||||
| -rw-r--r-- | openpgp/src/packet/key.rs | 24 | ||||
| -rw-r--r-- | openpgp/src/parse.rs | 2 | ||||
| -rw-r--r-- | openpgp/src/serialize/cert_armored.rs | 4 | ||||
| -rw-r--r-- | openpgp/src/types/bitfield.rs | 2 |
6 files changed, 21 insertions, 21 deletions
diff --git a/autocrypt/src/lib.rs b/autocrypt/src/lib.rs index b0cb7473..fb76df9f 100644 --- a/autocrypt/src/lib.rs +++ b/autocrypt/src/lib.rs @@ -542,8 +542,8 @@ impl AutocryptSetupMessage { /// Parses the autocrypt setup message in `r`. /// /// `passcode` is the passcode used to protect the message. - pub fn from_bytes<'a>(bytes: &'a [u8]) - -> Result<AutocryptSetupMessageParser<'a>> + pub fn from_bytes(bytes: &[u8]) + -> Result<AutocryptSetupMessageParser> { Self::from_reader(bytes) } diff --git a/net/src/wkd.rs b/net/src/wkd.rs index e563a168..5b2a1deb 100644 --- a/net/src/wkd.rs +++ b/net/src/wkd.rs @@ -234,11 +234,11 @@ fn parse_body<S: AsRef<str>>(body: &[u8], email_address: S) } } -fn get_following_redirects<'a, T>( - client: &'a hyper::client::Client<T>, +fn get_following_redirects<T>( + client: &hyper::client::Client<T>, url: Uri, depth: i32, -) -> BoxFuture<'a, Result<Response<Body>>> +) -> BoxFuture<Result<Response<Body>>> where T: hyper::client::connect::Connect + Clone + Send + Sync + 'static, { diff --git a/openpgp/src/packet/key.rs b/openpgp/src/packet/key.rs index ef49a291..d522b8b4 100644 --- a/openpgp/src/packet/key.rs +++ b/openpgp/src/packet/key.rs @@ -284,9 +284,9 @@ pub trait KeyParts: fmt::Debug + seal::Sealed { /// [`key::PublicParts`]: PublicParts /// [`key::UnspecifiedParts`]: UnspecifiedParts /// [`key::SecretParts`]: SecretParts - fn convert_key_amalgamation<'a, R: KeyRole>( - ka: ComponentAmalgamation<'a, Key<UnspecifiedParts, R>>) - -> Result<ComponentAmalgamation<'a, Key<Self, R>>> + fn convert_key_amalgamation<R: KeyRole>( + ka: ComponentAmalgamation<Key<UnspecifiedParts, R>>) + -> Result<ComponentAmalgamation<Key<Self, R>>> where Self: Sized; /// Converts a key amalgamation reference with unspecified parts @@ -464,9 +464,9 @@ impl KeyParts for PublicParts { Ok(bundle.into()) } - fn convert_key_amalgamation<'a, R: KeyRole>( - ka: ComponentAmalgamation<'a, Key<UnspecifiedParts, R>>) - -> Result<ComponentAmalgamation<'a, Key<Self, R>>> { + fn convert_key_amalgamation<R: KeyRole>( + ka: ComponentAmalgamation<Key<UnspecifiedParts, R>>) + -> Result<ComponentAmalgamation<Key<Self, R>>> { Ok(ka.into()) } @@ -520,9 +520,9 @@ impl KeyParts for SecretParts { bundle.try_into() } - fn convert_key_amalgamation<'a, R: KeyRole>( - ka: ComponentAmalgamation<'a, Key<UnspecifiedParts, R>>) - -> Result<ComponentAmalgamation<'a, Key<Self, R>>> { + fn convert_key_amalgamation<R: KeyRole>( + ka: ComponentAmalgamation<Key<UnspecifiedParts, R>>) + -> Result<ComponentAmalgamation<Key<Self, R>>> { ka.try_into() } @@ -584,9 +584,9 @@ impl KeyParts for UnspecifiedParts { Ok(bundle) } - fn convert_key_amalgamation<'a, R: KeyRole>( - ka: ComponentAmalgamation<'a, Key<UnspecifiedParts, R>>) - -> Result<ComponentAmalgamation<'a, Key<UnspecifiedParts, R>>> { + fn convert_key_amalgamation<R: KeyRole>( + ka: ComponentAmalgamation<Key<UnspecifiedParts, R>>) + -> Result<ComponentAmalgamation<Key<UnspecifiedParts, R>>> { Ok(ka) } diff --git a/openpgp/src/parse.rs b/openpgp/src/parse.rs index e2aa2660..36e28eb3 100644 --- a/openpgp/src/parse.rs +++ b/openpgp/src/parse.rs @@ -4807,7 +4807,7 @@ impl <'a> PacketParser<'a> { /// } /// # Ok(()) } // Note: this function is public and may be called multiple times! - pub fn finish<'b>(&'b mut self) -> Result<&'b Packet> { + pub fn finish(&mut self) -> Result<&Packet> { let indent = self.recursion_depth(); tracer!(TRACE, "PacketParser::finish", indent); diff --git a/openpgp/src/serialize/cert_armored.rs b/openpgp/src/serialize/cert_armored.rs index 529a4379..65b4dd25 100644 --- a/openpgp/src/serialize/cert_armored.rs +++ b/openpgp/src/serialize/cert_armored.rs @@ -81,8 +81,8 @@ impl Cert { /// assert!(armored.contains("Mr. Pink ☮☮☮")); /// # Ok(()) } /// ``` - pub fn armored<'a>(&'a self) - -> impl crate::serialize::Serialize + crate::serialize::SerializeInto + 'a + pub fn armored(&self) + -> impl crate::serialize::Serialize + crate::serialize::SerializeInto + '_ { Encoder::new(self) } diff --git a/openpgp/src/types/bitfield.rs b/openpgp/src/types/bitfield.rs index c6dd5f13..9fce02c3 100644 --- a/openpgp/src/types/bitfield.rs +++ b/openpgp/src/types/bitfield.rs @@ -11,7 +11,7 @@ impl From<Vec<u8>> for Bitfield { } impl Bitfield { - pub fn iter<'a>(&'a self) -> impl Iterator<Item = usize> + Send + Sync + 'a + pub fn iter(&self) -> impl Iterator<Item = usize> + Send + Sync + '_ { self.raw.iter() .flat_map(|b| { |