diff options
author | Nora Widdecke <nora@sequoia-pgp.org> | 2021-04-07 21:08:16 +0200 |
---|---|---|
committer | Nora Widdecke <nora@sequoia-pgp.org> | 2021-04-09 13:13:59 +0200 |
commit | a58579221bc8c4fbeba89bd55644415fe0368117 (patch) | |
tree | 0e2392e3b6c9b44b89de2058d9755ebde7993e24 | |
parent | 73b3321d98e0298dba5d4ef63e8058a01cc2943c (diff) |
Lint: Remove unecessary imports.
- https://rust-lang.github.io/rust-clippy/master/index.html#single_component_path_imports
38 files changed, 7 insertions, 51 deletions
diff --git a/autocrypt/src/lib.rs b/autocrypt/src/lib.rs index b3bebd65..3c8c5cb0 100644 --- a/autocrypt/src/lib.rs +++ b/autocrypt/src/lib.rs @@ -13,8 +13,6 @@ #![doc(html_logo_url = "https://docs.sequoia-pgp.org/logo.svg")] #![warn(missing_docs)] -use base64; - use std::convert::TryFrom; use std::io; use std::io::prelude::*; diff --git a/ffi-macros/src/lib.rs b/ffi-macros/src/lib.rs index c4bb0269..a4e426cc 100644 --- a/ffi-macros/src/lib.rs +++ b/ffi-macros/src/lib.rs @@ -9,12 +9,9 @@ use std::collections::HashMap; use std::io::Write; use lazy_static::lazy_static; -use syn; + use syn::parse_quote; use syn::spanned::Spanned; -use proc_macro; -use proc_macro2; -use sha2; use proc_macro::TokenStream; use proc_macro2::TokenStream as TokenStream2; diff --git a/ffi-macros/src/rust2c.rs b/ffi-macros/src/rust2c.rs index 8d1d26df..f4595813 100644 --- a/ffi-macros/src/rust2c.rs +++ b/ffi-macros/src/rust2c.rs @@ -1,6 +1,4 @@ -use syn; use quote::ToTokens; -use proc_macro2; const PREFIX: &str = "pgp_"; diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs index 66d65033..1edf1493 100644 --- a/ffi/src/lib.rs +++ b/ffi/src/lib.rs @@ -109,7 +109,6 @@ #![doc(html_logo_url = "https://docs.sequoia-pgp.org/logo.svg")] #![warn(missing_docs)] -use sequoia_ffi_macros; use sequoia_ffi_macros::{ ffi_wrapper_type, }; diff --git a/ffi/tests/c-tests.rs b/ffi/tests/c-tests.rs index 40f82094..178ddfc1 100644 --- a/ffi/tests/c-tests.rs +++ b/ffi/tests/c-tests.rs @@ -1,5 +1,4 @@ use anyhow::{Result, Context}; -use filetime; use std::cmp::min; use std::env::{self, var_os}; diff --git a/ipc/build.rs b/ipc/build.rs index f508b38e..b8977c53 100644 --- a/ipc/build.rs +++ b/ipc/build.rs @@ -2,7 +2,6 @@ use std::env; use std::fs; use std::io::{self, Write}; use std::path::PathBuf; -use lalrpop; fn main() { lalrpop::process_root().unwrap(); diff --git a/ipc/examples/assuan-client.rs b/ipc/examples/assuan-client.rs index 16c6ed41..f6d19235 100644 --- a/ipc/examples/assuan-client.rs +++ b/ipc/examples/assuan-client.rs @@ -1,5 +1,4 @@ use futures::StreamExt; -use clap; use sequoia_ipc as ipc; use crate::ipc::assuan::Client; diff --git a/ipc/examples/gpg-agent-client.rs b/ipc/examples/gpg-agent-client.rs index 64b60234..f993b8c2 100644 --- a/ipc/examples/gpg-agent-client.rs +++ b/ipc/examples/gpg-agent-client.rs @@ -1,7 +1,6 @@ /// Connects to and sends commands to gpg-agent. use futures::StreamExt; -use clap; use sequoia_ipc as ipc; use crate::ipc::gnupg::{Context, Agent}; diff --git a/ipc/examples/gpg-agent-decrypt.rs b/ipc/examples/gpg-agent-decrypt.rs index 98b0f721..f612668a 100644 --- a/ipc/examples/gpg-agent-decrypt.rs +++ b/ipc/examples/gpg-agent-decrypt.rs @@ -3,7 +3,6 @@ use std::collections::HashMap; use std::io; -use clap; use sequoia_openpgp as openpgp; use sequoia_ipc as ipc; diff --git a/ipc/examples/gpg-agent-sign.rs b/ipc/examples/gpg-agent-sign.rs index f77e8b6f..e2445107 100644 --- a/ipc/examples/gpg-agent-sign.rs +++ b/ipc/examples/gpg-agent-sign.rs @@ -2,7 +2,6 @@ use std::io; -use clap; use sequoia_openpgp as openpgp; use sequoia_ipc as ipc; diff --git a/ipc/src/core.rs b/ipc/src/core.rs index 56522ccd..0b43a9ce 100644 --- a/ipc/src/core.rs +++ b/ipc/src/core.rs @@ -21,8 +21,6 @@ #![doc(html_logo_url = "https://docs.sequoia-pgp.org/logo.svg")] #![warn(missing_docs)] -use dirs; -use tempfile; use std::io; use std::path::{Path, PathBuf}; diff --git a/openpgp-ffi/src/armor.rs b/openpgp-ffi/src/armor.rs index 85916e29..cc6c6fa2 100644 --- a/openpgp-ffi/src/armor.rs +++ b/openpgp-ffi/src/armor.rs @@ -9,8 +9,7 @@ use std::ptr; use std::slice; use libc::{self, c_char, c_int, size_t}; -use sequoia_openpgp; -use self::sequoia_openpgp::armor; +use sequoia_openpgp::armor; use super::io::{Reader, ReaderKind, WriterKind}; use crate::Maybe; diff --git a/openpgp-ffi/src/lib.rs b/openpgp-ffi/src/lib.rs index 9072c636..8300dc5f 100644 --- a/openpgp-ffi/src/lib.rs +++ b/openpgp-ffi/src/lib.rs @@ -317,9 +317,6 @@ #![doc(html_logo_url = "https://docs.sequoia-pgp.org/logo.svg")] #![warn(missing_docs)] -use libc; - -use sequoia_ffi_macros; use sequoia_ffi_macros::{ ffi_wrapper_type, }; diff --git a/openpgp-ffi/tests/c-tests.rs b/openpgp-ffi/tests/c-tests.rs index ee906b0e..bdaf2317 100644 --- a/openpgp-ffi/tests/c-tests.rs +++ b/openpgp-ffi/tests/c-tests.rs @@ -1,5 +1,4 @@ use anyhow::{Result, Context}; -use filetime; use std::cmp::min; use std::env::{self, var_os}; diff --git a/openpgp/build.rs b/openpgp/build.rs index f508b38e..b8977c53 100644 --- a/openpgp/build.rs +++ b/openpgp/build.rs @@ -2,7 +2,6 @@ use std::env; use std::fs; use std::io::{self, Write}; use std::path::PathBuf; -use lalrpop; fn main() { lalrpop::process_root().unwrap(); diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs index b8f7316b..e0642f41 100644 --- a/openpgp/examples/sign-detached.rs +++ b/openpgp/examples/sign-detached.rs @@ -5,7 +5,7 @@ use std::io; use anyhow::Context; -use rpassword; + use sequoia_openpgp as openpgp; diff --git a/openpgp/src/armor.rs b/openpgp/src/armor.rs index 6a5eb9bb..1fa3c671 100644 --- a/openpgp/src/armor.rs +++ b/openpgp/src/armor.rs @@ -28,7 +28,6 @@ //! # Ok(()) } //! ``` -use base64; use buffered_reader::BufferedReader; use std::convert::TryFrom; use std::fmt; diff --git a/openpgp/src/crypto/mem.rs b/openpgp/src/crypto/mem.rs index 59056cac..10ef3f4e 100644 --- a/openpgp/src/crypto/mem.rs +++ b/openpgp/src/crypto/mem.rs @@ -26,7 +26,6 @@ use std::fmt; use std::hash::{Hash, Hasher}; use std::ops::{Deref, DerefMut}; -use memsec; /// Protected memory. /// @@ -247,7 +246,6 @@ const ENCRYPTED_MEMORY_PAGE_SIZE: usize = 4096; /// Code outside of it cannot access it, because `PREKEY` is private. mod has_access_to_prekey { use std::io::{self, Cursor, Write}; - use lazy_static; use crate::types::{AEADAlgorithm, HashAlgorithm, SymmetricAlgorithm}; use crate::crypto::{aead, SessionKey}; use crate::crypto::hash::Digest; diff --git a/openpgp/src/parse.rs b/openpgp/src/parse.rs index 4a91d7b2..48a731ca 100644 --- a/openpgp/src/parse.rs +++ b/openpgp/src/parse.rs @@ -176,7 +176,7 @@ //! [`SEIP`]: ../packet/enum.SEIP.html //! [`MDC`]: ../packet/struct.MDC.html //! [`AED`]: ../packet/enum.AED.html -use std; + use std::io; use std::io::prelude::*; use std::convert::TryFrom; diff --git a/openpgp/src/parse/partial_body.rs b/openpgp/src/parse/partial_body.rs index 3df2b390..bd9a26c8 100644 --- a/openpgp/src/parse/partial_body.rs +++ b/openpgp/src/parse/partial_body.rs @@ -1,4 +1,4 @@ -use std; + use std::cmp; use std::io; use std::io::{Error, ErrorKind}; diff --git a/openpgp/src/regex/mod.rs b/openpgp/src/regex/mod.rs index 6d3cd408..1e07dd5c 100644 --- a/openpgp/src/regex/mod.rs +++ b/openpgp/src/regex/mod.rs @@ -243,7 +243,6 @@ use std::fmt; use lalrpop_util::ParseError; use regex_syntax::hir::{self, Hir}; -use regex; use crate::Error; use crate::Result; diff --git a/openpgp/src/serialize/stream/dash_escape.rs b/openpgp/src/serialize/stream/dash_escape.rs index c84f3f0c..b34cb314 100644 --- a/openpgp/src/serialize/stream/dash_escape.rs +++ b/openpgp/src/serialize/stream/dash_escape.rs @@ -5,7 +5,6 @@ //! //! [Section 7.1 of RFC 4880]: https://tools.ietf.org/html/rfc4880#section-7.1 -use std; use std::fmt; use std::io; diff --git a/openpgp/src/serialize/stream/partial_body.rs b/openpgp/src/serialize/stream/partial_body.rs index d85ca96e..298b97d2 100644 --- a/openpgp/src/serialize/stream/partial_body.rs +++ b/openpgp/src/serialize/stream/partial_body.rs @@ -1,6 +1,5 @@ //! Encodes a byte stream using OpenPGP's partial body encoding. -use std; use std::fmt; use std::io; use std::cmp; diff --git a/openpgp/src/serialize/stream/trim_whitespace.rs b/openpgp/src/serialize/stream/trim_whitespace.rs index 1236b6f6..b77d9951 100644 --- a/openpgp/src/serialize/stream/trim_whitespace.rs +++ b/openpgp/src/serialize/stream/trim_whitespace.rs @@ -5,7 +5,6 @@ //! //! [Section 7.1 of RFC 4880]: https://tools.ietf.org/html/rfc4880#section-7.1 -use std; use std::fmt; use std::io; diff --git a/sq/src/commands/decrypt.rs b/sq/src/commands/decrypt.rs index adf66e44..5a8a038e 100644 --- a/sq/src/commands/decrypt.rs +++ b/sq/src/commands/decrypt.rs @@ -1,7 +1,6 @@ use anyhow::Context as _; use std::collections::HashMap; use std::io; -use rpassword; use sequoia_openpgp as openpgp; use crate::openpgp::types::SymmetricAlgorithm; diff --git a/sq/src/commands/inspect.rs b/sq/src/commands/inspect.rs index fa990951..e6e86d01 100644 --- a/sq/src/commands/inspect.rs +++ b/sq/src/commands/inspect.rs @@ -1,7 +1,7 @@ use std::convert::TryFrom; use std::io::{self, Read}; -use clap; + use sequoia_openpgp as openpgp; use crate::openpgp::{KeyHandle, Packet, Result}; diff --git a/sq/src/commands/mod.rs b/sq/src/commands/mod.rs index 3a9630ed..c216d35e 100644 --- a/sq/src/commands/mod.rs +++ b/sq/src/commands/mod.rs @@ -4,7 +4,6 @@ use std::collections::{HashMap, HashSet}; use std::fs::File; use std::io::{self, Write}; use std::time::SystemTime; -use rpassword; use sequoia_openpgp as openpgp; use crate::openpgp::{ diff --git a/sq/tests/sq-certify.rs b/sq/tests/sq-certify.rs index 4fddb136..128b4ed8 100644 --- a/sq/tests/sq-certify.rs +++ b/sq/tests/sq-certify.rs @@ -1,9 +1,7 @@ use std::fs::File; use std::time::Duration; -use assert_cli; use assert_cli::Assert; -use tempfile; use tempfile::TempDir; use sequoia_openpgp as openpgp; diff --git a/sq/tests/sq-sign.rs b/sq/tests/sq-sign.rs index 0efef3ab..4836e2fe 100644 --- a/sq/tests/sq-sign.rs +++ b/sq/tests/sq-sign.rs @@ -1,9 +1,7 @@ use std::fs::{self, File}; use std::io; -use assert_cli; use assert_cli::Assert; -use tempfile; use tempfile::TempDir; use sequoia_openpgp as openpgp; diff --git a/sqv/src/sqv.rs b/sqv/src/sqv.rs index a9828ee0..08beef3c 100644 --- a/sqv/src/sqv.rs +++ b/sqv/src/sqv.rs @@ -6,7 +6,6 @@ use std::process::exit; use chrono::{DateTime, offset::Utc}; -use clap; use anyhow::Context; use sequoia_openpgp as openpgp; diff --git a/sqv/tests/duplicate-signatures.rs b/sqv/tests/duplicate-signatures.rs index 10d789e2..e48cb3ad 100644 --- a/sqv/tests/duplicate-signatures.rs +++ b/sqv/tests/duplicate-signatures.rs @@ -1,4 +1,3 @@ -use assert_cli; use assert_cli::Assert; diff --git a/sqv/tests/multiple-signatures.rs b/sqv/tests/multiple-signatures.rs index e423215e..01065e4b 100644 --- a/sqv/tests/multiple-signatures.rs +++ b/sqv/tests/multiple-signatures.rs @@ -1,4 +1,3 @@ -use assert_cli; use assert_cli::Assert; diff --git a/store/src/backend/log.rs b/store/src/backend/log.rs index 65606c2d..722b51c3 100644 --- a/store/src/backend/log.rs +++ b/store/src/backend/log.rs @@ -5,7 +5,7 @@ use rusqlite::{Connection, types::ToSql}; use super::{ ID, Timestamp, Rc, Result, node, MappingServer, BindingServer, KeyServer, - Promise, capnp, capnp_rpc + Promise, capnp_rpc }; /// Models entries referring to other objects. diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs index 4197f43b..a1ec476e 100644 --- a/store/src/backend/mod.rs +++ b/store/src/backend/mod.rs @@ -8,7 +8,6 @@ use std::rc::Rc; use std::time::Duration; use capnp::capability::Promise; -use capnp; use capnp_rpc::rpc_twoparty_capnp::Side; use capnp_rpc::{self, RpcSystem, twoparty}; use rand::distributions::{Distribution, Uniform}; diff --git a/store/src/backend/support.rs b/store/src/backend/support.rs index 5cd44ad5..74dfe88e 100644 --- a/store/src/backend/support.rs +++ b/store/src/backend/support.rs @@ -1,6 +1,5 @@ //! Data types for working with `rusqlite`. -use rusqlite; use rusqlite::types::{ToSql, ToSqlOutput, FromSql, FromSqlResult, ValueRef}; use std::fmt; use std::ops::Add; diff --git a/store/src/lib.rs b/store/src/lib.rs index cc2687de..ff7e3e71 100644 --- a/store/src/lib.rs +++ b/store/src/lib.rs @@ -51,7 +51,6 @@ #![doc(html_logo_url = "https://docs.sequoia-pgp.org/logo.svg")] #![warn(missing_docs)] -use capnp; #[macro_use] extern crate capnp_rpc; diff --git a/store/src/server.rs b/store/src/server.rs index 156ee0ad..90c02732 100644 --- a/store/src/server.rs +++ b/store/src/server.rs @@ -1,5 +1,3 @@ -use sequoia_ipc; -use sequoia_store; use sequoia_ipc::Server; diff --git a/store/tests/ipc-policy.rs b/store/tests/ipc-policy.rs index 1ff2d6fe..47447435 100644 --- a/store/tests/ipc-policy.rs +++ b/store/tests/ipc-policy.rs @@ -1,4 +1,3 @@ -use sequoia_store; use std::env::current_exe; use std::path::PathBuf; |