From 57531dbe5b277a46982e4dd2b0ab6c20ebe43682 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Wed, 14 Oct 2020 11:36:45 +0200 Subject: Replace most 'extern crate' directives with 'use'. - See #480. --- buffered-reader/src/lib.rs | 6 -- core/src/lib.rs | 4 +- ffi-macros/src/lib.rs | 10 ++- ffi-macros/src/rust2c.rs | 4 +- ffi/src/error.rs | 2 +- ffi/src/lib.rs | 12 +--- ffi/src/net.rs | 3 +- ffi/src/store.rs | 2 - ffi/tests/c-tests.rs | 2 +- ipc/build.rs | 2 +- ipc/examples/assuan-client.rs | 6 +- ipc/examples/gpg-agent-client.rs | 6 +- ipc/examples/gpg-agent-decrypt.rs | 6 +- ipc/examples/gpg-agent-sign.rs | 6 +- ipc/src/lib.rs | 6 +- ipc/tests/gpg-agent.rs | 6 +- net/src/lib.rs | 29 ++++---- net/src/wkd.rs | 5 +- net/tests/hkp.rs | 18 ++--- openpgp-ffi/src/amalgamation.rs | 2 +- openpgp-ffi/src/armor.rs | 2 +- openpgp-ffi/src/cert.rs | 2 +- openpgp-ffi/src/common.rs | 2 +- openpgp-ffi/src/crypto.rs | 2 +- openpgp-ffi/src/error.rs | 2 +- openpgp-ffi/src/fingerprint.rs | 2 +- openpgp-ffi/src/io.rs | 2 +- openpgp-ffi/src/key_amalgamation.rs | 2 +- openpgp-ffi/src/keyid.rs | 2 +- openpgp-ffi/src/lib.rs | 9 +-- openpgp-ffi/src/packet/key.rs | 2 +- openpgp-ffi/src/packet/literal.rs | 2 +- openpgp-ffi/src/packet/mod.rs | 2 +- openpgp-ffi/src/packet/pkesk.rs | 2 +- openpgp-ffi/src/packet/signature.rs | 2 +- openpgp-ffi/src/packet/skesk.rs | 2 +- openpgp-ffi/src/packet/user_attribute.rs | 2 +- openpgp-ffi/src/packet/userid.rs | 2 +- openpgp-ffi/src/packet_pile.rs | 2 +- openpgp-ffi/src/parse/mod.rs | 2 +- openpgp-ffi/src/parse/stream.rs | 2 +- openpgp-ffi/src/policy.rs | 2 +- openpgp-ffi/src/revocation_status.rs | 2 +- openpgp-ffi/src/serialize.rs | 2 +- openpgp-ffi/src/tsk.rs | 2 +- openpgp-ffi/tests/c-tests.rs | 2 +- openpgp/build.rs | 2 +- openpgp/src/armor.rs | 4 +- openpgp/src/cert/amalgamation.rs | 28 ++++---- openpgp/src/cert/amalgamation/iter.rs | 10 +-- openpgp/src/cert/amalgamation/key.rs | 46 ++++++------- openpgp/src/cert/amalgamation/key/iter.rs | 42 ++++++------ openpgp/src/cert/bundle.rs | 26 +++---- openpgp/src/cert/mod.rs | 4 +- openpgp/src/cert/prelude.rs | 2 +- openpgp/src/fingerprint.rs | 4 +- openpgp/src/keyhandle.rs | 2 +- openpgp/src/keyid.rs | 4 +- openpgp/src/lib.rs | 3 - openpgp/src/message/mod.rs | 2 +- openpgp/src/packet/container.rs | 2 +- openpgp/src/packet/prelude.rs | 2 +- openpgp/src/packet/signature/subpacket.rs | 4 +- openpgp/src/packet/userid.rs | 6 +- openpgp/src/packet_pile.rs | 16 ++--- openpgp/src/parse/stream.rs | 2 +- openpgp/src/serialize.rs | 4 +- openpgp/src/tests.rs | 2 +- openpgp/tests/for-each-artifact.rs | 2 +- sqv/build.rs | 2 +- sqv/src/sqv.rs | 4 +- sqv/tests/bad-subkey.rs | 2 - sqv/tests/duplicate-signatures.rs | 2 +- sqv/tests/multiple-signatures.rs | 2 +- sqv/tests/not-before-after.rs | 2 - sqv/tests/revoked-key.rs | 2 - sqv/tests/wrong-key-flags.rs | 4 +- store/build.rs | 2 - store/src/lib.rs | 109 +++++++++++++++--------------- store/src/server.rs | 5 +- store/tests/ipc-policy.rs | 4 +- tool/build.rs | 2 +- tool/src/commands/decrypt.rs | 4 +- tool/src/commands/dump.rs | 2 +- tool/src/commands/inspect.rs | 2 +- tool/src/commands/mod.rs | 4 +- tool/src/commands/sign.rs | 2 +- tool/src/sq.rs | 20 ++---- tool/tests/sq-sign.rs | 6 +- 89 files changed, 270 insertions(+), 327 deletions(-) diff --git a/buffered-reader/src/lib.rs b/buffered-reader/src/lib.rs index 32765d74..1b08e73c 100644 --- a/buffered-reader/src/lib.rs +++ b/buffered-reader/src/lib.rs @@ -223,12 +223,6 @@ //! [`BufReader`]: https://doc.rust-lang.org/stable/std/io/struct.BufReader.html //! [HTTP's chunk transfer encoding]: https://en.wikipedia.org/wiki/Chunked_transfer_encoding -#[cfg(feature = "compression-deflate")] -extern crate flate2; -#[cfg(feature = "compression-bzip2")] -extern crate bzip2; -extern crate libc; - use std::io; use std::io::{Error, ErrorKind}; use std::cmp; diff --git a/core/src/lib.rs b/core/src/lib.rs index 5db7e6bf..b1b39d2e 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -18,8 +18,8 @@ /// # } /// ``` -extern crate dirs; -extern crate tempfile; +use dirs; +use tempfile; use std::fmt; use std::io; diff --git a/ffi-macros/src/lib.rs b/ffi-macros/src/lib.rs index db37daef..6a3d2386 100644 --- a/ffi-macros/src/lib.rs +++ b/ffi-macros/src/lib.rs @@ -5,15 +5,13 @@ use std::collections::HashMap; use std::io::Write; -extern crate lazy_static; use lazy_static::lazy_static; -extern crate syn; +use syn; use syn::parse_quote; use syn::spanned::Spanned; -extern crate quote; -extern crate proc_macro; -extern crate proc_macro2; -extern crate sha2; +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 2e469703..d0e252f5 100644 --- a/ffi-macros/src/rust2c.rs +++ b/ffi-macros/src/rust2c.rs @@ -1,6 +1,6 @@ -extern crate syn; +use syn; use syn::export::ToTokens; -extern crate proc_macro2; +use proc_macro2; const PREFIX: &'static str = "pgp_"; diff --git a/ffi/src/error.rs b/ffi/src/error.rs index 26940111..935d4515 100644 --- a/ffi/src/error.rs +++ b/ffi/src/error.rs @@ -2,7 +2,7 @@ use std::io; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use sequoia_core as core; pub use crate::openpgp::error::Status; diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs index ab2819ae..45844ded 100644 --- a/ffi/src/lib.rs +++ b/ffi/src/lib.rs @@ -107,20 +107,10 @@ #![warn(missing_docs)] -#[macro_use] -extern crate lazy_static; -extern crate libc; -extern crate native_tls; -extern crate memsec; - -extern crate sequoia_ffi_macros; +use sequoia_ffi_macros; use sequoia_ffi_macros::{ ffi_wrapper_type, }; -extern crate sequoia_openpgp; -extern crate sequoia_core; -extern crate sequoia_net; -extern crate sequoia_store; #[macro_use] pub mod openpgp { diff --git a/ffi/src/net.rs b/ffi/src/net.rs index 52fc7982..d386e92d 100644 --- a/ffi/src/net.rs +++ b/ffi/src/net.rs @@ -37,8 +37,7 @@ use native_tls::Certificate; use std::ptr; use std::slice; -extern crate sequoia_openpgp as openpgp; -extern crate tokio_core; +use tokio_core; use sequoia_net::KeyServer; diff --git a/ffi/src/store.rs b/ffi/src/store.rs index 5e6dce3d..408b02a5 100644 --- a/ffi/src/store.rs +++ b/ffi/src/store.rs @@ -26,8 +26,6 @@ use libc::c_char; use std::ptr; -extern crate sequoia_openpgp as openpgp; - use sequoia_store::{ self, Mapping, MappingIter, Binding, BundleIter, Key, KeyIter, LogIter, Store, }; diff --git a/ffi/tests/c-tests.rs b/ffi/tests/c-tests.rs index 7670f13b..e5af5c1f 100644 --- a/ffi/tests/c-tests.rs +++ b/ffi/tests/c-tests.rs @@ -1,5 +1,5 @@ use anyhow::{Result, Context}; -extern crate filetime; +use filetime; use std::cmp::min; use std::env::{self, var_os}; diff --git a/ipc/build.rs b/ipc/build.rs index 5c8a9ffb..f508b38e 100644 --- a/ipc/build.rs +++ b/ipc/build.rs @@ -2,7 +2,7 @@ use std::env; use std::fs; use std::io::{self, Write}; use std::path::PathBuf; -extern crate lalrpop; +use lalrpop; fn main() { lalrpop::process_root().unwrap(); diff --git a/ipc/examples/assuan-client.rs b/ipc/examples/assuan-client.rs index 841cc754..6d790363 100644 --- a/ipc/examples/assuan-client.rs +++ b/ipc/examples/assuan-client.rs @@ -1,8 +1,8 @@ -extern crate futures; +use futures; use futures::future::Future; use futures::stream::Stream; -extern crate clap; -extern crate sequoia_ipc as ipc; +use clap; +use sequoia_ipc as ipc; use crate::ipc::assuan::Client; fn main() { diff --git a/ipc/examples/gpg-agent-client.rs b/ipc/examples/gpg-agent-client.rs index 836efbdb..61a29e84 100644 --- a/ipc/examples/gpg-agent-client.rs +++ b/ipc/examples/gpg-agent-client.rs @@ -1,10 +1,10 @@ /// Connects to and sends commands to gpg-agent. -extern crate futures; +use futures; use futures::future::Future; use futures::stream::Stream; -extern crate clap; -extern crate sequoia_ipc as ipc; +use clap; +use sequoia_ipc as ipc; use crate::ipc::gnupg::{Context, Agent}; fn main() { diff --git a/ipc/examples/gpg-agent-decrypt.rs b/ipc/examples/gpg-agent-decrypt.rs index 76be71db..8b5ead32 100644 --- a/ipc/examples/gpg-agent-decrypt.rs +++ b/ipc/examples/gpg-agent-decrypt.rs @@ -3,9 +3,9 @@ use std::collections::HashMap; use std::io; -extern crate clap; -extern crate sequoia_openpgp as openpgp; -extern crate sequoia_ipc as ipc; +use clap; +use sequoia_openpgp as openpgp; +use sequoia_ipc as ipc; use crate::openpgp::cert::prelude::*; use crate::openpgp::crypto::SessionKey; diff --git a/ipc/examples/gpg-agent-sign.rs b/ipc/examples/gpg-agent-sign.rs index 2991089a..d65df8a1 100644 --- a/ipc/examples/gpg-agent-sign.rs +++ b/ipc/examples/gpg-agent-sign.rs @@ -2,9 +2,9 @@ use std::io; -extern crate clap; -extern crate sequoia_openpgp as openpgp; -extern crate sequoia_ipc as ipc; +use clap; +use sequoia_openpgp as openpgp; +use sequoia_ipc as ipc; use crate::openpgp::armor; use crate::openpgp::parse::Parse; diff --git a/ipc/src/lib.rs b/ipc/src/lib.rs index 28b8272d..50ab9e9a 100644 --- a/ipc/src/lib.rs +++ b/ipc/src/lib.rs @@ -359,9 +359,9 @@ impl Server { /// /// ```compile_fail /// // We cannot run this because sequoia-store is not built yet. - /// extern crate sequoia_core; - /// extern crate sequoia_net; - /// extern crate sequoia_store; + /// use sequoia_core; + /// use sequoia_net; + /// use sequoia_store; /// /// use sequoia_ipc::Server; /// diff --git a/ipc/tests/gpg-agent.rs b/ipc/tests/gpg-agent.rs index c303cdd4..5d8e041b 100644 --- a/ipc/tests/gpg-agent.rs +++ b/ipc/tests/gpg-agent.rs @@ -2,11 +2,11 @@ use std::io::{self, Write}; -extern crate futures; +use futures; use futures::future::Future; use futures::stream::Stream; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use crate::openpgp::types::{ HashAlgorithm, SymmetricAlgorithm, @@ -17,7 +17,7 @@ use crate::openpgp::serialize::{Serialize, stream::*}; use crate::openpgp::cert::prelude::*; use crate::openpgp::policy::Policy; -extern crate sequoia_ipc as ipc; +use sequoia_ipc as ipc; use crate::ipc::gnupg::{Context, Agent, KeyPair}; macro_rules! make_context { diff --git a/net/src/lib.rs b/net/src/lib.rs index b339daf9..64b3e3e0 100644 --- a/net/src/lib.rs +++ b/net/src/lib.rs @@ -14,10 +14,8 @@ //! [SKS keyserver]: https://www.sks-keyservers.net/overview-of-pools.php#pool_hkps //! //! ```no_run -//! # extern crate tokio_core; -//! # extern crate sequoia_openpgp as openpgp; -//! # extern crate sequoia_core; -//! # extern crate sequoia_net; +//! # use tokio_core; +//! # use sequoia_openpgp as openpgp; //! # use openpgp::KeyID; //! # use sequoia_core::Context; //! # use sequoia_net::{KeyServer, Result}; @@ -35,19 +33,16 @@ #![warn(missing_docs)] -extern crate sequoia_openpgp as openpgp; -extern crate sequoia_core; - -extern crate futures; -extern crate http; -extern crate hyper; -extern crate hyper_tls; -extern crate native_tls; -extern crate tokio_core; -extern crate tokio_io; -extern crate percent_encoding; -extern crate url; -extern crate zbase32; +use sequoia_openpgp as openpgp; +use sequoia_core; + +use futures; +use http; +use hyper; +use hyper_tls; +use native_tls; +use percent_encoding; +use url; use futures::{future, Future, Stream}; use hyper::client::{ResponseFuture, HttpConnector}; diff --git a/net/src/wkd.rs b/net/src/wkd.rs index 07f322bc..53ecdfb5 100644 --- a/net/src/wkd.rs +++ b/net/src/wkd.rs @@ -14,8 +14,6 @@ // XXX: We might want to merge the 2 structs in the future and move the // functions to methods. -extern crate tempfile; -extern crate tokio_core; use std::collections::HashMap; use std::fmt; @@ -29,6 +27,7 @@ use hyper_tls::HttpsConnector; use url; use crate::openpgp::{ + self, Fingerprint, Cert, }; @@ -265,9 +264,7 @@ fn parse_body>(body: &[u8], email_address: S) /// # Example /// /// ```no_run -/// extern crate tokio_core; /// use tokio_core::reactor::Core; -/// extern crate sequoia_net; /// use sequoia_net::wkd; /// /// let email_address = "foo@bar.baz"; diff --git a/net/tests/hkp.rs b/net/tests/hkp.rs index e095213d..ff41d9a8 100644 --- a/net/tests/hkp.rs +++ b/net/tests/hkp.rs @@ -1,9 +1,9 @@ -extern crate futures; -extern crate http; -extern crate hyper; -extern crate rand; -extern crate tokio_core; -extern crate url; +use futures; +use http; +use hyper; +use rand; +use tokio_core; +use url; use futures::Stream; use futures::future::Future; @@ -20,9 +20,9 @@ use std::net::{SocketAddr, IpAddr, Ipv4Addr}; use std::thread; use tokio_core::reactor::Core; -extern crate sequoia_openpgp as openpgp; -extern crate sequoia_core; -extern crate sequoia_net; +use sequoia_openpgp as openpgp; +use sequoia_core; +use sequoia_net; use crate::openpgp::armor::Reader; use crate::openpgp::Cert; diff --git a/openpgp-ffi/src/amalgamation.rs b/openpgp-ffi/src/amalgamation.rs index 18cf83e8..b67a9752 100644 --- a/openpgp-ffi/src/amalgamation.rs +++ b/openpgp-ffi/src/amalgamation.rs @@ -7,7 +7,7 @@ use libc::time_t; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use self::openpgp::cert::amalgamation::ValidAmalgamation as _; use self::openpgp::cert::amalgamation::ValidateAmalgamation as _; diff --git a/openpgp-ffi/src/armor.rs b/openpgp-ffi/src/armor.rs index 094d4dc7..9421e783 100644 --- a/openpgp-ffi/src/armor.rs +++ b/openpgp-ffi/src/armor.rs @@ -9,7 +9,7 @@ use std::ptr; use std::slice; use libc::{self, c_char, c_int, size_t}; -extern crate sequoia_openpgp; +use sequoia_openpgp; use self::sequoia_openpgp::armor; use super::io::{Reader, ReaderKind, WriterKind}; diff --git a/openpgp-ffi/src/cert.rs b/openpgp-ffi/src/cert.rs index 4917e789..c3893399 100644 --- a/openpgp-ffi/src/cert.rs +++ b/openpgp-ffi/src/cert.rs @@ -10,7 +10,7 @@ use std::ptr; use std::slice; use libc::{c_char, c_int, size_t, time_t}; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use self::openpgp::{ crypto, crypto::Password, diff --git a/openpgp-ffi/src/common.rs b/openpgp-ffi/src/common.rs index 529a33e5..72b60298 100644 --- a/openpgp-ffi/src/common.rs +++ b/openpgp-ffi/src/common.rs @@ -297,7 +297,7 @@ pub type Maybe = Option<::std::ptr::NonNull>; /// This is used to derive Hasher instances for computing hashes of /// objects so that they can be used in hash tables by foreign code. pub(crate) fn build_hasher() -> DefaultHasher { - lazy_static! { + lazy_static::lazy_static! { static ref RANDOM_STATE: RandomState = RandomState::new(); } RANDOM_STATE.build_hasher() diff --git a/openpgp-ffi/src/crypto.rs b/openpgp-ffi/src/crypto.rs index 90db3180..d19732fc 100644 --- a/openpgp-ffi/src/crypto.rs +++ b/openpgp-ffi/src/crypto.rs @@ -6,7 +6,7 @@ use libc::size_t; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use self::openpgp::{ crypto, }; diff --git a/openpgp-ffi/src/error.rs b/openpgp-ffi/src/error.rs index 5b2bc06d..d1e9e962 100644 --- a/openpgp-ffi/src/error.rs +++ b/openpgp-ffi/src/error.rs @@ -3,7 +3,7 @@ use std::io; use libc::c_char; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use crate::MoveIntoRaw; use crate::RefRaw; diff --git a/openpgp-ffi/src/fingerprint.rs b/openpgp-ffi/src/fingerprint.rs index ba60bd44..76303631 100644 --- a/openpgp-ffi/src/fingerprint.rs +++ b/openpgp-ffi/src/fingerprint.rs @@ -13,7 +13,7 @@ use std::slice; use libc::{c_char, size_t}; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use super::keyid::KeyID; use crate::Maybe; use crate::MoveIntoRaw; diff --git a/openpgp-ffi/src/io.rs b/openpgp-ffi/src/io.rs index ab07961e..7ecab443 100644 --- a/openpgp-ffi/src/io.rs +++ b/openpgp-ffi/src/io.rs @@ -9,7 +9,7 @@ use libc::{c_void, c_char, size_t, ssize_t, realloc}; #[cfg(unix)] use std::os::unix::io::FromRawFd; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use crate::Maybe; use crate::RefMutRaw; diff --git a/openpgp-ffi/src/key_amalgamation.rs b/openpgp-ffi/src/key_amalgamation.rs index 26a67d20..49544b91 100644 --- a/openpgp-ffi/src/key_amalgamation.rs +++ b/openpgp-ffi/src/key_amalgamation.rs @@ -8,7 +8,7 @@ use std::slice; use libc::{size_t, time_t}; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use self::openpgp::packet::key; use self::openpgp::cert::amalgamation::ValidAmalgamation; use self::openpgp::cert::amalgamation::ValidateAmalgamation; diff --git a/openpgp-ffi/src/keyid.rs b/openpgp-ffi/src/keyid.rs index f21c4a84..1cbd41b8 100644 --- a/openpgp-ffi/src/keyid.rs +++ b/openpgp-ffi/src/keyid.rs @@ -13,7 +13,7 @@ use std::slice; use libc::{c_char}; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use crate::Maybe; use crate::RefRaw; diff --git a/openpgp-ffi/src/lib.rs b/openpgp-ffi/src/lib.rs index 28cba4f1..d36582a3 100644 --- a/openpgp-ffi/src/lib.rs +++ b/openpgp-ffi/src/lib.rs @@ -315,16 +315,11 @@ #![warn(missing_docs)] -#[macro_use] -extern crate lazy_static; -extern crate libc; -extern crate memsec; +use libc; -extern crate sequoia_ffi_macros; +use sequoia_ffi_macros; use sequoia_ffi_macros::{ ffi_wrapper_type, }; -extern crate sequoia_openpgp; - include!("common.rs"); diff --git a/openpgp-ffi/src/packet/key.rs b/openpgp-ffi/src/packet/key.rs index 088c3325..1ec3b62a 100644 --- a/openpgp-ffi/src/packet/key.rs +++ b/openpgp-ffi/src/packet/key.rs @@ -7,7 +7,7 @@ use libc::{c_int, time_t, size_t}; use std::slice; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use self::openpgp::packet::key; use self::openpgp::crypto::Password; use super::super::fingerprint::Fingerprint; diff --git a/openpgp-ffi/src/packet/literal.rs b/openpgp-ffi/src/packet/literal.rs index 0628241d..2efea3c6 100644 --- a/openpgp-ffi/src/packet/literal.rs +++ b/openpgp-ffi/src/packet/literal.rs @@ -9,7 +9,7 @@ use libc::c_char; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use super::Packet; diff --git a/openpgp-ffi/src/packet/mod.rs b/openpgp-ffi/src/packet/mod.rs index d3392c99..5ccd2eab 100644 --- a/openpgp-ffi/src/packet/mod.rs +++ b/openpgp-ffi/src/packet/mod.rs @@ -6,7 +6,7 @@ use libc::c_char; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use self::openpgp::{ packet::Tag, diff --git a/openpgp-ffi/src/packet/pkesk.rs b/openpgp-ffi/src/packet/pkesk.rs index bbecddb0..6193cbb1 100644 --- a/openpgp-ffi/src/packet/pkesk.rs +++ b/openpgp-ffi/src/packet/pkesk.rs @@ -2,7 +2,7 @@ use libc::size_t; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use self::openpgp::packet::PKESK; use super::super::keyid::KeyID; use super::super::packet::key::Key; diff --git a/openpgp-ffi/src/packet/signature.rs b/openpgp-ffi/src/packet/signature.rs index d746a13c..b6d611f9 100644 --- a/openpgp-ffi/src/packet/signature.rs +++ b/openpgp-ffi/src/packet/signature.rs @@ -10,7 +10,7 @@ use libc::time_t; use libc::c_uint; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use openpgp::types::KeyFlags; use super::Packet; use super::super::fingerprint::Fingerprint; diff --git a/openpgp-ffi/src/packet/skesk.rs b/openpgp-ffi/src/packet/skesk.rs index cf4ba297..ddc41e1c 100644 --- a/openpgp-ffi/src/packet/skesk.rs +++ b/openpgp-ffi/src/packet/skesk.rs @@ -3,7 +3,7 @@ use std::slice; use libc::size_t; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use super::Packet; use crate::error::Status; diff --git a/openpgp-ffi/src/packet/user_attribute.rs b/openpgp-ffi/src/packet/user_attribute.rs index f24c60eb..42e7d156 100644 --- a/openpgp-ffi/src/packet/user_attribute.rs +++ b/openpgp-ffi/src/packet/user_attribute.rs @@ -5,7 +5,7 @@ //! [Section 5.12 of RFC 4880]: https://tools.ietf.org/html/rfc4880#section-5.12 use libc::size_t; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use super::Packet; use crate::RefRaw; diff --git a/openpgp-ffi/src/packet/userid.rs b/openpgp-ffi/src/packet/userid.rs index 339f1486..2e9a68c0 100644 --- a/openpgp-ffi/src/packet/userid.rs +++ b/openpgp-ffi/src/packet/userid.rs @@ -4,7 +4,7 @@ //! //! [Section 5.11 of RFC 4880]: https://tools.ietf.org/html/rfc4880#section-5.11 -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use libc::{c_char, size_t}; use crate::error::Status; use super::Packet; diff --git a/openpgp-ffi/src/packet_pile.rs b/openpgp-ffi/src/packet_pile.rs index 1fef7bb8..eca015c6 100644 --- a/openpgp-ffi/src/packet_pile.rs +++ b/openpgp-ffi/src/packet_pile.rs @@ -5,7 +5,7 @@ //! //! [`sequoia-openpgp::PacketPile`]: ../../../sequoia_openpgp/struct.PacketPile.html -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; /// A `PacketPile` holds a deserialized sequence of OpenPGP messages. /// diff --git a/openpgp-ffi/src/parse/mod.rs b/openpgp-ffi/src/parse/mod.rs index d3ed1407..dea6d0e4 100644 --- a/openpgp-ffi/src/parse/mod.rs +++ b/openpgp-ffi/src/parse/mod.rs @@ -11,7 +11,7 @@ use std::ptr; use std::slice; use libc::{c_char, c_int, size_t}; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use super::packet::{ Packet, diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs index ff5de6ed..d1c2f625 100644 --- a/openpgp-ffi/src/parse/stream.rs +++ b/openpgp-ffi/src/parse/stream.rs @@ -13,7 +13,7 @@ use std::ptr; use libc::{c_int, c_void, time_t}; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use self::openpgp::{ cert::prelude::*, diff --git a/openpgp-ffi/src/policy.rs b/openpgp-ffi/src/policy.rs index 50a69236..d1857796 100644 --- a/openpgp-ffi/src/policy.rs +++ b/openpgp-ffi/src/policy.rs @@ -8,7 +8,7 @@ //! //! [`sequoia-openpgp::policy`]: ../../sequoia_openpgp/policy/index.html -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use crate::MoveIntoRaw; diff --git a/openpgp-ffi/src/revocation_status.rs b/openpgp-ffi/src/revocation_status.rs index cab266a8..3b34af6d 100644 --- a/openpgp-ffi/src/revocation_status.rs +++ b/openpgp-ffi/src/revocation_status.rs @@ -2,7 +2,7 @@ use libc::c_int; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use crate::RefRaw; diff --git a/openpgp-ffi/src/serialize.rs b/openpgp-ffi/src/serialize.rs index 982bafc0..aecf1a0a 100644 --- a/openpgp-ffi/src/serialize.rs +++ b/openpgp-ffi/src/serialize.rs @@ -10,7 +10,7 @@ use std::slice; use std::io::Write; use libc::{c_char, size_t, ssize_t}; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use self::openpgp::types::{ SymmetricAlgorithm, diff --git a/openpgp-ffi/src/tsk.rs b/openpgp-ffi/src/tsk.rs index bc4307ef..08785015 100644 --- a/openpgp-ffi/src/tsk.rs +++ b/openpgp-ffi/src/tsk.rs @@ -4,7 +4,7 @@ //! //! [`sequoia-openpgp::serialize::TSK`]: ../../../sequoia_openpgp/serialize/struct.TSK.html -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; /// A transferable secret key (TSK). /// diff --git a/openpgp-ffi/tests/c-tests.rs b/openpgp-ffi/tests/c-tests.rs index aba29a28..30dc3bc8 100644 --- a/openpgp-ffi/tests/c-tests.rs +++ b/openpgp-ffi/tests/c-tests.rs @@ -1,5 +1,5 @@ use anyhow::{Result, Context}; -extern crate filetime; +use filetime; use std::cmp::min; use std::env::{self, var_os}; diff --git a/openpgp/build.rs b/openpgp/build.rs index 5c8a9ffb..f508b38e 100644 --- a/openpgp/build.rs +++ b/openpgp/build.rs @@ -2,7 +2,7 @@ use std::env; use std::fs; use std::io::{self, Write}; use std::path::PathBuf; -extern crate lalrpop; +use lalrpop; fn main() { lalrpop::process_root().unwrap(); diff --git a/openpgp/src/armor.rs b/openpgp/src/armor.rs index cfbbf4ae..54380acf 100644 --- a/openpgp/src/armor.rs +++ b/openpgp/src/armor.rs @@ -26,7 +26,7 @@ //! let mut r = Reader::new(&mut file, ReaderMode::Tolerant(Some(Kind::File))); //! ``` -extern crate base64; +use base64; use buffered_reader::BufferedReader; use std::io::{Cursor, Read, Write}; use std::io::{Result, Error, ErrorKind}; @@ -637,7 +637,7 @@ impl<'a> Reader<'a> { // The range of the first 6 bits of a message is limited. // Save cpu cycles by only considering base64 data that starts // with one of those characters. - lazy_static!{ + lazy_static::lazy_static!{ static ref START_CHARS : Vec = { let mut valid_start = Vec::new(); for &tag in &[ Tag::PKESK, Tag::SKESK, diff --git a/openpgp/src/cert/amalgamation.rs b/openpgp/src/cert/amalgamation.rs index 019b11b5..def67a4d 100644 --- a/openpgp/src/cert/amalgamation.rs +++ b/openpgp/src/cert/amalgamation.rs @@ -153,7 +153,7 @@ //! code, which doesn't compile: //! //! ```compile_fail -//! # extern crate sequoia_openpgp as openpgp; +//! # use sequoia_openpgp as openpgp; //! use openpgp::cert::prelude::*; //! use openpgp::packet::prelude::*; //! @@ -186,7 +186,7 @@ //! below for the [`ComponentAmalgamation::component`] method: //! //! ``` -//! # extern crate sequoia_openpgp as openpgp; +//! # use sequoia_openpgp as openpgp; //! use openpgp::cert::prelude::*; //! use openpgp::packet::prelude::*; //! @@ -276,7 +276,7 @@ pub mod key; /// # Examples /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// use openpgp::cert::prelude::*; /// use openpgp::policy::{Policy, StandardPolicy}; /// @@ -386,7 +386,7 @@ pub trait ValidAmalgamation<'a, C: 'a> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::StandardPolicy; /// # @@ -415,7 +415,7 @@ pub trait ValidAmalgamation<'a, C: 'a> /// ``` /// # use std::time::{SystemTime, Duration, UNIX_EPOCH}; /// # - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::StandardPolicy; /// fn f(ua: &ValidUserIDAmalgamation) { @@ -443,7 +443,7 @@ pub trait ValidAmalgamation<'a, C: 'a> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::{Policy, StandardPolicy}; /// # @@ -470,7 +470,7 @@ pub trait ValidAmalgamation<'a, C: 'a> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::{Policy, StandardPolicy}; /// # @@ -502,7 +502,7 @@ pub trait ValidAmalgamation<'a, C: 'a> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::{Policy, StandardPolicy}; /// # @@ -546,7 +546,7 @@ pub trait ValidAmalgamation<'a, C: 'a> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// use openpgp::cert::prelude::*; /// # use openpgp::policy::StandardPolicy; /// use openpgp::types::RevocationStatus; @@ -595,7 +595,7 @@ pub trait ValidAmalgamation<'a, C: 'a> /// # Examples /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::StandardPolicy; /// # @@ -686,7 +686,7 @@ impl<'a, C> ComponentAmalgamation<'a, C> { /// Returns the component's associated certificate. /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # /// # fn main() -> openpgp::Result<()> { @@ -730,7 +730,7 @@ impl<'a, C> ComponentAmalgamation<'a, C> { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// use openpgp::cert::prelude::*; /// use openpgp::packet::prelude::*; /// @@ -843,7 +843,7 @@ impl<'a, C> ComponentAmalgamation<'a, C> { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; @@ -996,7 +996,7 @@ impl<'a> UserAttributeAmalgamation<'a> { /// Print out information about all non-revoked User IDs. /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// use openpgp::cert::prelude::*; /// use openpgp::packet::prelude::*; /// use openpgp::policy::StandardPolicy; diff --git a/openpgp/src/cert/amalgamation/iter.rs b/openpgp/src/cert/amalgamation/iter.rs index 44a36a14..b35bd48e 100644 --- a/openpgp/src/cert/amalgamation/iter.rs +++ b/openpgp/src/cert/amalgamation/iter.rs @@ -37,7 +37,7 @@ use crate::{ /// Iterate over the User IDs in a certificate: /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// use openpgp::cert::prelude::*; /// /// # @@ -57,7 +57,7 @@ use crate::{ /// Only return valid User IDs. /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -154,7 +154,7 @@ impl<'a, C> ComponentAmalgamationIter<'a, C> { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -209,7 +209,7 @@ impl<'a, C> ComponentAmalgamationIter<'a, C> { /// # Examples /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -333,7 +333,7 @@ impl<'a, C> ValidComponentAmalgamationIter<'a, C> { /// `revoked(false)`) is equivalent to: /// /// ```rust - /// extern crate sequoia_openpgp as openpgp; + /// use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// use openpgp::cert::prelude::*; /// use openpgp::types::RevocationStatus; diff --git a/openpgp/src/cert/amalgamation/key.rs b/openpgp/src/cert/amalgamation/key.rs index 4fca9926..02106f2d 100644 --- a/openpgp/src/cert/amalgamation/key.rs +++ b/openpgp/src/cert/amalgamation/key.rs @@ -46,7 +46,7 @@ //! //! ``` //! # use std::convert::TryInto; -//! # extern crate sequoia_openpgp as openpgp; +//! # use sequoia_openpgp as openpgp; //! # use openpgp::cert::prelude::*; //! # use openpgp::packet::prelude::*; //! # let (cert, _) = CertBuilder::new() @@ -81,7 +81,7 @@ //! message: //! //! ```rust -//! # extern crate sequoia_openpgp as openpgp; +//! # use sequoia_openpgp as openpgp; //! # use openpgp::Result; //! # use openpgp::cert::prelude::*; //! use openpgp::types::RevocationStatus; @@ -140,7 +140,7 @@ //! is not valid, then forging the time stamp won't help an attacker. //! //! ```rust -//! # extern crate sequoia_openpgp as openpgp; +//! # use sequoia_openpgp as openpgp; //! # use openpgp::Result; //! # use openpgp::cert::prelude::*; //! use openpgp::types::RevocationStatus; @@ -217,7 +217,7 @@ //! approach. //! //! ```rust -//! # extern crate sequoia_openpgp as openpgp; +//! # use sequoia_openpgp as openpgp; //! # use openpgp::Result; //! # use openpgp::cert::prelude::*; //! use sequoia_openpgp::policy::StandardPolicy; @@ -305,7 +305,7 @@ pub trait PrimaryKey<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::StandardPolicy; /// # @@ -360,7 +360,7 @@ pub trait PrimaryKey<'a, P, R> /// Iterating over all keys: /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::StandardPolicy; /// # @@ -380,7 +380,7 @@ pub trait PrimaryKey<'a, P, R> /// Getting the primary key: /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::StandardPolicy; /// # @@ -398,7 +398,7 @@ pub trait PrimaryKey<'a, P, R> /// Iterating over just the subkeys: /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::StandardPolicy; /// # @@ -841,7 +841,7 @@ impl<'a, P, R, R2> KeyAmalgamation<'a, P, R, R2> /// Find all non-revoked, live, signing-capable keys: /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// use openpgp::types::RevocationStatus; @@ -1262,7 +1262,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1310,7 +1310,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1380,7 +1380,7 @@ impl<'a, P> ValidPrimaryKeyAmalgamation<'a, P> /// /// ``` /// use std::time; - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1462,7 +1462,7 @@ impl<'a, P> ValidSubordinateKeyAmalgamation<'a, P> /// /// ``` /// use std::time; - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1701,7 +1701,7 @@ impl<'a, P> ValidErasedKeyAmalgamation<'a, P> /// /// ``` /// use std::time; - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1825,7 +1825,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # use openpgp::policy::{Policy, StandardPolicy}; /// # @@ -1856,7 +1856,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// motion) *or* storage encryption (data at rest): /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// use openpgp::types::KeyFlags; @@ -1912,7 +1912,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// Finds keys that are certification capable: /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1946,7 +1946,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// Finds keys that are signing capable: /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1979,7 +1979,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// Finds keys that are authentication capable: /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -2024,7 +2024,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// Finds keys that are storage-encryption capable: /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -2071,7 +2071,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// Finds keys that are transport-encryption capable: /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -2113,7 +2113,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// ``` /// use std::time; /// use std::convert::TryInto; - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// use openpgp::types::Timestamp; @@ -2163,7 +2163,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2> /// ``` /// use std::time; /// use std::convert::TryInto; - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// use openpgp::types::Timestamp; diff --git a/openpgp/src/cert/amalgamation/key/iter.rs b/openpgp/src/cert/amalgamation/key/iter.rs index f50a8118..98a9e808 100644 --- a/openpgp/src/cert/amalgamation/key/iter.rs +++ b/openpgp/src/cert/amalgamation/key/iter.rs @@ -233,7 +233,7 @@ impl<'a, P, R> KeyAmalgamationIter<'a, P, R> /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// # fn main() { f().unwrap(); } @@ -269,7 +269,7 @@ impl<'a, P, R> KeyAmalgamationIter<'a, P, R> /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// # fn main() { f().unwrap(); } @@ -312,7 +312,7 @@ impl<'a, P, R> KeyAmalgamationIter<'a, P, R> /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// # fn main() { f().unwrap(); } @@ -357,7 +357,7 @@ impl<'a, P, R> KeyAmalgamationIter<'a, P, R> /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// # fn main() { f().unwrap(); } @@ -399,7 +399,7 @@ impl<'a, P, R> KeyAmalgamationIter<'a, P, R> /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// # @@ -454,7 +454,7 @@ impl<'a, P, R> KeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -531,7 +531,7 @@ impl<'a, P, R> KeyAmalgamationIter<'a, P, R> /// Find a key that we can use to sign a document: /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// use openpgp::types::RevocationStatus; @@ -846,7 +846,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// use openpgp::types::KeyFlags; @@ -917,7 +917,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -962,7 +962,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1005,7 +1005,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1048,7 +1048,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1091,7 +1091,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1134,7 +1134,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1181,7 +1181,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// @@ -1210,7 +1210,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// `ValidKeyAmalgamationIter::revoked(false)` is equivalent to: /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// use openpgp::types::RevocationStatus; /// # use openpgp::cert::prelude::*; @@ -1269,7 +1269,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; @@ -1315,7 +1315,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; @@ -1368,7 +1368,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; @@ -1417,7 +1417,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; @@ -1463,7 +1463,7 @@ impl<'a, P, R> ValidKeyAmalgamationIter<'a, P, R> /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// diff --git a/openpgp/src/cert/bundle.rs b/openpgp/src/cert/bundle.rs index 5de0b97b..915cb2ef 100644 --- a/openpgp/src/cert/bundle.rs +++ b/openpgp/src/cert/bundle.rs @@ -177,7 +177,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # /// # fn main() -> openpgp::Result<()> { @@ -210,7 +210,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -377,7 +377,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -406,7 +406,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -436,7 +436,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -466,7 +466,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -688,7 +688,7 @@ impl ComponentBundle> { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # /// # fn main() -> openpgp::Result<()> { @@ -731,7 +731,7 @@ impl ComponentBundle> { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -769,7 +769,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # /// # fn main() -> openpgp::Result<()> { @@ -806,7 +806,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -844,7 +844,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # /// # fn main() -> openpgp::Result<()> { @@ -877,7 +877,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// use openpgp::policy::StandardPolicy; /// # @@ -915,7 +915,7 @@ impl ComponentBundle { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::cert::prelude::*; /// # /// # fn main() -> openpgp::Result<()> { diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs index 73790d59..a094f9da 100644 --- a/openpgp/src/cert/mod.rs +++ b/openpgp/src/cert/mod.rs @@ -411,7 +411,7 @@ type UnknownBundles = ComponentBundles; /// # Examples /// /// ``` -/// extern crate sequoia_openpgp as openpgp; +/// use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// use openpgp::cert::prelude::*; /// use sequoia_openpgp::policy::StandardPolicy; @@ -587,7 +587,7 @@ use super::*; /// adapted to suit your policy: /// /// ```rust -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::parse::{Parse, PacketParserResult, PacketParser}; /// use std::convert::TryFrom; diff --git a/openpgp/src/cert/prelude.rs b/openpgp/src/cert/prelude.rs index f79f8714..d924e561 100644 --- a/openpgp/src/cert/prelude.rs +++ b/openpgp/src/cert/prelude.rs @@ -8,7 +8,7 @@ //! //! ``` //! # #![allow(unused_imports)] -//! # extern crate sequoia_openpgp as openpgp; +//! # use sequoia_openpgp as openpgp; //! use openpgp::cert::prelude::*; //! ``` diff --git a/openpgp/src/fingerprint.rs b/openpgp/src/fingerprint.rs index 07559d7c..c2dfce1d 100644 --- a/openpgp/src/fingerprint.rs +++ b/openpgp/src/fingerprint.rs @@ -92,7 +92,7 @@ impl Fingerprint { /// object with the `:X` format specifier. /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// use openpgp::Fingerprint; /// /// let fpr = "0123 4567 89AB CDEF 0123 4567 89AB CDEF 0123 4567".parse::().unwrap(); @@ -111,7 +111,7 @@ impl Fingerprint { /// optional leading `0x`. /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// use openpgp::Fingerprint; /// /// let fpr = Fingerprint::from_hex("0123456789ABCDEF0123456789ABCDEF01234567").unwrap(); diff --git a/openpgp/src/keyhandle.rs b/openpgp/src/keyhandle.rs index e92efd05..86824e76 100644 --- a/openpgp/src/keyhandle.rs +++ b/openpgp/src/keyhandle.rs @@ -185,7 +185,7 @@ impl KeyHandle { /// non-transitive equality relation: /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Fingerprint; /// # use openpgp::KeyID; /// # use openpgp::KeyHandle; diff --git a/openpgp/src/keyid.rs b/openpgp/src/keyid.rs index e5bd9bcb..7b545165 100644 --- a/openpgp/src/keyid.rs +++ b/openpgp/src/keyid.rs @@ -183,7 +183,7 @@ impl KeyID { /// object with the `:X` format specifier. /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// use openpgp::KeyID; /// /// let keyid = "fb3751f1587daef1".parse::().unwrap(); @@ -202,7 +202,7 @@ impl KeyID { /// leading `0x`. /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// use openpgp::KeyID; /// /// let keyid = KeyID::from_hex("0xfb3751f1587daef1").unwrap(); diff --git a/openpgp/src/lib.rs b/openpgp/src/lib.rs index 4e7744a1..cce9ad6e 100644 --- a/openpgp/src/lib.rs +++ b/openpgp/src/lib.rs @@ -48,9 +48,6 @@ #[macro_use] extern crate quickcheck; -#[macro_use] -extern crate lazy_static; - #[macro_use] mod macros; diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs index 88d12f56..82dd1695 100644 --- a/openpgp/src/message/mod.rs +++ b/openpgp/src/message/mod.rs @@ -405,7 +405,7 @@ impl Message { /// # Examples /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # fn main() { f().unwrap(); } /// # fn f() -> openpgp::Result<()> { /// use std::io; diff --git a/openpgp/src/packet/container.rs b/openpgp/src/packet/container.rs index bd404a44..29a40d9b 100644 --- a/openpgp/src/packet/container.rs +++ b/openpgp/src/packet/container.rs @@ -282,7 +282,7 @@ impl Container { /// Returns the hash for the empty body. fn empty_body_digest() -> Vec { - lazy_static!{ + lazy_static::lazy_static!{ static ref DIGEST: Vec = { let mut h = Container::make_body_hash(); let mut d = vec![0; h.digest_size()]; diff --git a/openpgp/src/packet/prelude.rs b/openpgp/src/packet/prelude.rs index c0df4d78..91c5f53b 100644 --- a/openpgp/src/packet/prelude.rs +++ b/openpgp/src/packet/prelude.rs @@ -17,7 +17,7 @@ //! //! ``` //! # #![allow(unused_imports)] -//! # extern crate sequoia_openpgp as openpgp; +//! # use sequoia_openpgp as openpgp; //! use openpgp::packet::prelude::*; //! ``` diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs index 58593709..42430a4f 100644 --- a/openpgp/src/packet/signature/subpacket.rs +++ b/openpgp/src/packet/signature/subpacket.rs @@ -30,7 +30,7 @@ //! Print any Issuer Fingerprint subpackets: //! //! ```rust -//! # extern crate sequoia_openpgp as openpgp; +//! # use sequoia_openpgp as openpgp; //! # use openpgp::Result; //! # use openpgp::Packet; //! # use openpgp::parse::{Parse, PacketParserResult, PacketParser}; @@ -96,7 +96,7 @@ use crate::types::{ Timestamp, }; -lazy_static!{ +lazy_static::lazy_static!{ /// The default amount of tolerance to use when comparing /// some timestamps. /// diff --git a/openpgp/src/packet/userid.rs b/openpgp/src/packet/userid.rs index 63426e22..139f3cff 100644 --- a/openpgp/src/packet/userid.rs +++ b/openpgp/src/packet/userid.rs @@ -59,7 +59,7 @@ impl ConventionallyParsedUserID { } fn parse(userid: String) -> Result { - lazy_static!{ + lazy_static::lazy_static!{ static ref USER_ID_PARSER: Regex = { // Whitespace. let ws_bare = " "; @@ -696,7 +696,7 @@ impl UserID { /// [conventional User ID]: #conventional-user-ids /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::packet::UserID; /// assert_eq!(UserID::from_address( /// "John Smith".into(), @@ -729,7 +729,7 @@ impl UserID { /// [conventional User ID]: #conventional-user-ids /// /// ``` - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::packet::UserID; /// assert_eq!(UserID::from_unchecked_address( /// "NAS".into(), diff --git a/openpgp/src/packet_pile.rs b/openpgp/src/packet_pile.rs index 5cebda45..a7d3c03c 100644 --- a/openpgp/src/packet_pile.rs +++ b/openpgp/src/packet_pile.rs @@ -32,7 +32,7 @@ use crate::parse::Cookie; /// This example shows how to modify packets in PacketPile using [`pathspec`]s. /// /// ```rust -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// use std::convert::TryFrom; /// use openpgp::{Packet, PacketPile}; /// use openpgp::packet::signature::Signature4; @@ -232,7 +232,7 @@ impl PacketPile { /// # Example /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::{Result, types::{CompressionAlgorithm, DataFormat}, /// # Packet, PacketPile, packet::Literal, packet::CompressedData}; /// # fn main() { f().unwrap(); } @@ -287,7 +287,7 @@ impl PacketPile { /// # Example /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::{Result, types::{CompressionAlgorithm, DataFormat}, /// # Packet, PacketPile, packet::Literal, packet::CompressedData}; /// # fn main() { f().unwrap(); } @@ -348,7 +348,7 @@ impl PacketPile { /// # Example /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::{Result, types::{CompressionAlgorithm, DataFormat}, /// # Packet, PacketPile, packet::Literal, packet::CompressedData}; /// # fn main() { f().unwrap(); } @@ -436,7 +436,7 @@ impl PacketPile { /// depth-first order. /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::{Result, types::{CompressionAlgorithm, DataFormat}, /// # Packet, PacketPile, packet::Literal, packet::Tag}; /// # use std::iter::Iterator; @@ -460,7 +460,7 @@ impl PacketPile { /// Returns an iterator over the top-level packets. /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::{Result, types::{CompressionAlgorithm, DataFormat}, /// # Packet, PacketPile, packet::Literal, packet::CompressedData}; /// # fn main() { f().unwrap(); } @@ -483,7 +483,7 @@ impl PacketPile { /// Returns an `IntoIter` over the top-level packets. /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::{Result, types::{CompressionAlgorithm, DataFormat}, /// # Packet, PacketPile, packet::Literal, packet::Tag}; /// # fn main() { f().unwrap(); } @@ -643,7 +643,7 @@ impl<'a> PacketParserBuilder<'a> { /// # Examples /// /// ```rust - /// # extern crate sequoia_openpgp as openpgp; + /// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::PacketPile; /// # use openpgp::parse::{Parse, PacketParser, PacketParserBuilder}; diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs index f308ca4d..3fee1267 100644 --- a/openpgp/src/parse/stream.rs +++ b/openpgp/src/parse/stream.rs @@ -3126,7 +3126,7 @@ mod test { #[test] fn detached_verifier() { - lazy_static! { + lazy_static::lazy_static! { static ref ZEROS: Vec = vec![0; 100 * 1024 * 1024]; } diff --git a/openpgp/src/serialize.rs b/openpgp/src/serialize.rs index 0ebecf42..68821583 100644 --- a/openpgp/src/serialize.rs +++ b/openpgp/src/serialize.rs @@ -188,7 +188,7 @@ const TRACE : bool = false; /// it: /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// use openpgp::cert::prelude::*; /// use openpgp::Packet; @@ -213,7 +213,7 @@ const TRACE : bool = false; /// on those objects, for example: /// /// ``` -/// # extern crate sequoia_openpgp as openpgp; +/// # use sequoia_openpgp as openpgp; /// # use openpgp::Result; /// # use openpgp::cert::prelude::*; /// # use openpgp::Packet; diff --git a/openpgp/src/tests.rs b/openpgp/src/tests.rs index c1685f8c..6c241555 100644 --- a/openpgp/src/tests.rs +++ b/openpgp/src/tests.rs @@ -55,7 +55,7 @@ pub const TSKS: &[&Test] = &[ /// Returns the content of the given file below `openpgp/tests/data`. pub fn file(name: &str) -> &'static [u8] { - lazy_static! { + lazy_static::lazy_static! { static ref FILES: BTreeMap<&'static str, &'static [u8]> = { let mut m: BTreeMap<&'static str, &'static [u8]> = Default::default(); diff --git a/openpgp/tests/for-each-artifact.rs b/openpgp/tests/for-each-artifact.rs index 8f049ef4..014bf18d 100644 --- a/openpgp/tests/for-each-artifact.rs +++ b/openpgp/tests/for-each-artifact.rs @@ -3,7 +3,7 @@ use std::fs; use std::io; use std::path::{Path, PathBuf}; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use crate::openpgp::parse::*; // Rustc 1.34 thinks SerializeInto is unused, but if we don't import // it, it correctly complains about no trait being in scope providing diff --git a/sqv/build.rs b/sqv/build.rs index ea6513b1..7c1eda1c 100644 --- a/sqv/build.rs +++ b/sqv/build.rs @@ -1,4 +1,4 @@ -extern crate clap; +use clap; use std::env; use std::fs; diff --git a/sqv/src/sqv.rs b/sqv/src/sqv.rs index 8e9509e7..45106812 100644 --- a/sqv/src/sqv.rs +++ b/sqv/src/sqv.rs @@ -6,10 +6,10 @@ use std::process::exit; use chrono::{DateTime, offset::Utc}; -extern crate clap; +use clap; use anyhow::Context; -extern crate sequoia_openpgp as openpgp; +use sequoia_openpgp as openpgp; use crate::openpgp::{ Cert, diff --git a/sqv/tests/bad-subkey.rs b/sqv/tests/bad-subkey.rs index bf83e2dc..7e5a4fbd 100644 --- a/sqv/tests/bad-subkey.rs +++ b/sqv/tests/bad-subkey.rs @@ -1,5 +1,3 @@ -extern crate assert_cli; - #[cfg(test)] mod integration { use std::path; diff --git a/sqv/tests/duplicate-signatures.rs b/sqv/tests/duplicate-signatures.rs index c91df964..10d789e2 100644 --- a/sqv/tests/duplicate-signatures.rs +++ b/sqv/tests/duplicate-signatures.rs @@ -1,4 +1,4 @@ -extern crate assert_cli; +use assert_cli; use assert_cli::Assert; diff --git a/sqv/tests/multiple-signatures.rs b/sqv/tests/multiple-signatures.rs index 69d5a982..e423215e 100644 --- a/sqv/tests/multiple-signatures.rs +++ b/sqv/tests/multiple-signatures.rs @@ -1,4 +1,4 @@ -extern crate assert_cli; +use assert_cli; use assert_cli::Assert; diff --git a/sqv/tests/not-before-after.rs b/sqv/tests/not-before-after.rs index 8279f41d..6b2ed805 100644 --- a/sqv/tests/not-before-after.rs +++ b/sqv/tests/not-before-after.rs @@ -1,5 +1,3 @@ -extern crate assert_cli; - #[cfg(test)] mod integration { use assert_cli::Assert; diff --git a/sqv/tests/revoked-key.rs b/sqv/tests/revoked-key.rs index e15ca621..44e41e41 100644 --- a/sqv/tests/revoked-key.rs +++ b/sqv/tests/revoked-key.rs @@ -38,8 +38,6 @@ //! now -| //! v -extern crate assert_cli; - #[cfg(test)] mod integration { use assert_cli::Assert; diff --git a/sqv/tests/wrong-key-flags.rs b/sqv/tests/wrong-key-flags.rs index 222297c5..477e00d0 100644 --- a/sqv/tests/wrong-key-flags.rs +++ b/sqv/tests/wrong-key-flags.rs @@ -1,5 +1,3 @@ -extern crate assert_cli; - #[cfg(test)] mod integration { use assert_cli::Assert; @@ -20,7 +18,7 @@ mod integration { } // Code to create the data for the test cases above -// extern crate sequoia_openpgp; +// use sequoia_openpgp;