summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2021-04-07 21:23:38 +0200
committerNora Widdecke <nora@sequoia-pgp.org>2021-04-09 13:13:59 +0200
commit8b49cc933cbeda3e34420679288c4985abdc6059 (patch)
tree1085c523be09c55de07160356dd9182c6a99bf61
parent253158696af836b4162fceadb29917f9eeb6d4a0 (diff)
Lint: Use get() instead of iter().next().
- https://rust-lang.github.io/rust-clippy/master/index.html#iter_next_slice
-rw-r--r--ffi-macros/src/lib.rs2
-rw-r--r--ffi/tests/c-tests.rs2
-rw-r--r--openpgp-ffi/tests/c-tests.rs2
-rw-r--r--openpgp/src/packet/pkesk.rs10
4 files changed, 8 insertions, 8 deletions
diff --git a/ffi-macros/src/lib.rs b/ffi-macros/src/lib.rs
index a4e426cc..27c6a183 100644
--- a/ffi-macros/src/lib.rs
+++ b/ffi-macros/src/lib.rs
@@ -40,7 +40,7 @@ pub fn cdecl(_attr: TokenStream, item: TokenStream) -> TokenStream {
// Extract all information from the parsed function that we need
// to compose the new function.
- let summary = fun.attrs.iter().next();
+ let summary = fun.attrs.get(0);
let attrs = fun.attrs.iter().skip(1)
.fold(TokenStream2::new(),
|mut acc, attr| {
diff --git a/ffi/tests/c-tests.rs b/ffi/tests/c-tests.rs
index 178ddfc1..fbca0600 100644
--- a/ffi/tests/c-tests.rs
+++ b/ffi/tests/c-tests.rs
@@ -221,7 +221,7 @@ fn build(include_dirs: &[PathBuf], ldpath: &Path, target_dir: &Path,
// rust source.
use filetime::FileTime;
let mtime = FileTime::from_last_modification_time(&meta_rs);
- filetime::set_file_times(target_c, mtime.clone(), mtime).unwrap();
+ filetime::set_file_times(target_c, mtime, mtime).unwrap();
}
let includes =
diff --git a/openpgp-ffi/tests/c-tests.rs b/openpgp-ffi/tests/c-tests.rs
index bdaf2317..7a75a9d6 100644
--- a/openpgp-ffi/tests/c-tests.rs
+++ b/openpgp-ffi/tests/c-tests.rs
@@ -220,7 +220,7 @@ fn build(include_dirs: &[PathBuf], ldpath: &Path, target_dir: &Path,
// rust source.
use filetime::FileTime;
let mtime = FileTime::from_last_modification_time(&meta_rs);
- filetime::set_file_times(target_c, mtime.clone(), mtime).unwrap();
+ filetime::set_file_times(target_c, mtime, mtime).unwrap();
}
let includes =
diff --git a/openpgp/src/packet/pkesk.rs b/openpgp/src/packet/pkesk.rs
index cba96f55..0c5e567f 100644
--- a/openpgp/src/packet/pkesk.rs
+++ b/openpgp/src/packet/pkesk.rs
@@ -240,7 +240,7 @@ mod tests {
cert.subkeys().next().unwrap()
.key().clone().parts_into_secret().unwrap().into_keypair().unwrap();
- let pkg = pile.descendants().skip(0).next().clone();
+ let pkg = pile.descendants().skip(0).next();
if let Some(Packet::PKESK(ref pkesk)) = pkg {
let plain = pkesk.decrypt(&mut keypair, None).unwrap();
@@ -265,7 +265,7 @@ mod tests {
cert.subkeys().next().unwrap()
.key().clone().parts_into_secret().unwrap().into_keypair().unwrap();
- let pkg = pile.descendants().skip(0).next().clone();
+ let pkg = pile.descendants().skip(0).next();
if let Some(Packet::PKESK(ref pkesk)) = pkg {
let plain = pkesk.decrypt(&mut keypair, None).unwrap();
@@ -290,7 +290,7 @@ mod tests {
cert.subkeys().next().unwrap()
.key().clone().parts_into_secret().unwrap().into_keypair().unwrap();
- let pkg = pile.descendants().skip(0).next().clone();
+ let pkg = pile.descendants().skip(0).next();
if let Some(Packet::PKESK(ref pkesk)) = pkg {
let plain = pkesk.decrypt(&mut keypair, None).unwrap();
@@ -315,7 +315,7 @@ mod tests {
cert.subkeys().next().unwrap()
.key().clone().parts_into_secret().unwrap().into_keypair().unwrap();
- let pkg = pile.descendants().skip(0).next().clone();
+ let pkg = pile.descendants().skip(0).next();
if let Some(Packet::PKESK(ref pkesk)) = pkg {
let plain = pkesk.decrypt(&mut keypair, None).unwrap();
@@ -340,7 +340,7 @@ mod tests {
cert.subkeys().next().unwrap()
.key().clone().parts_into_secret().unwrap().into_keypair().unwrap();
- let pkg = pile.descendants().skip(0).next().clone();
+ let pkg = pile.descendants().skip(0).next();
if let Some(Packet::PKESK(ref pkesk)) = pkg {
let plain = pkesk.decrypt(&mut keypair, None).unwrap();