diff options
| -rw-r--r-- | ffi-macros/src/lib.rs | 2 | ||||
| -rw-r--r-- | openpgp/src/armor.rs | 4 | ||||
| -rw-r--r-- | openpgp/src/cert/mod.rs | 2 | ||||
| -rw-r--r-- | openpgp/src/cert/parser/mod.rs | 2 | ||||
| -rw-r--r-- | openpgp/src/message/mod.rs | 4 | ||||
| -rw-r--r-- | openpgp/src/serialize/stream.rs | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/ffi-macros/src/lib.rs b/ffi-macros/src/lib.rs index 4d9590dc..e4107c49 100644 --- a/ffi-macros/src/lib.rs +++ b/ffi-macros/src/lib.rs @@ -291,7 +291,7 @@ pub fn ffi_wrapper_type(args: TokenStream, input: TokenStream) -> TokenStream { let default_derives = [ (derive_free as DeriveFn, None), ]; - for (dfn, arg) in derive.iter().chain(default_derives.into_iter()) { + for (dfn, arg) in derive.iter().chain(default_derives.iter()) { impls.extend(dfn(proc_macro2::Span::call_site(), &prefix, &name, &st, &wrapped_type, arg)); } diff --git a/openpgp/src/armor.rs b/openpgp/src/armor.rs index 7d1c4102..0a3282a4 100644 --- a/openpgp/src/armor.rs +++ b/openpgp/src/armor.rs @@ -593,10 +593,10 @@ impl<'a> Reader<'a> { lazy_static!{ static ref START_CHARS : Vec<u8> = { let mut valid_start = Vec::new(); - for &tag in [ Tag::PKESK, Tag::SKESK, + for &tag in &[ Tag::PKESK, Tag::SKESK, Tag::OnePassSig, Tag::Signature, Tag::PublicKey, Tag::SecretKey, - Tag::CompressedData, Tag::Literal ].into_iter() { + Tag::CompressedData, Tag::Literal ] { let mut ctb = [ 0u8; 1 ]; let mut o = [ 0u8; 4 ]; diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs index e691e1c4..3f7c4cf3 100644 --- a/openpgp/src/cert/mod.rs +++ b/openpgp/src/cert/mod.rs @@ -3371,7 +3371,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g= pk.into(), ])).unwrap(); - for (ref t, ref offset) in [ (t2, 0), (t4, 0), (t3, 100), (t1, 300) ].into_iter() { + for (t, offset) in &[ (t2, 0), (t4, 0), (t3, 100), (t1, 300) ] { for i in 0..100 { let binding = signature::Builder::new(SignatureType::DirectKey) .set_features(&Features::sequoia()).unwrap() diff --git a/openpgp/src/cert/parser/mod.rs b/openpgp/src/cert/parser/mod.rs index 7b77aeac..4d0b3b1d 100644 --- a/openpgp/src/cert/parser/mod.rs +++ b/openpgp/src/cert/parser/mod.rs @@ -895,7 +895,7 @@ mod test { }, ]; - for v in test_vectors.into_iter() { + for v in &test_vectors { if v.result { let mut l = CertValidator::new(); for token in v.s.into_iter() { diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs index a43f2c59..51c548e0 100644 --- a/openpgp/src/message/mod.rs +++ b/openpgp/src/message/mod.rs @@ -581,7 +581,7 @@ mod tests { }, ]; - for v in test_vectors.into_iter() { + for v in &test_vectors { if v.result { let mut l = MessageValidator::new(); for token in v.s.iter() { @@ -700,7 +700,7 @@ mod tests { }, ]; - for v in test_vectors.into_iter() { + for v in &test_vectors { let mut l = MessageValidator::new(); for (token, depth) in v.s.iter() { l.push(*token, diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs index 389b6d90..6c6d2c78 100644 --- a/openpgp/src/serialize/stream.rs +++ b/openpgp/src/serialize/stream.rs @@ -1717,13 +1717,13 @@ mod test { // literal.finalize().unwrap(); } - for &read_len in [ + for &read_len in &[ 37, Encryptor::AEAD_CHUNK_SIZE - 1, Encryptor::AEAD_CHUNK_SIZE, 100 * Encryptor::AEAD_CHUNK_SIZE - ].into_iter() { - for &do_err in [ false, true ].into_iter() { + ] { + for &do_err in &[ false, true ] { let mut msg = msg.clone(); if do_err { let l = msg.len() - 1; |