diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-10-14 11:36:45 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-10-14 12:01:22 +0200 |
commit | 57531dbe5b277a46982e4dd2b0ab6c20ebe43682 (patch) | |
tree | 9fddc14e92f2da4fd7c99c145d4c7ea76bf6a993 /openpgp-ffi/src | |
parent | ea4eaf796404c0fde15509274190cc4668c5d08e (diff) |
Replace most 'extern crate' directives with 'use'.
- See #480.
Diffstat (limited to 'openpgp-ffi/src')
26 files changed, 27 insertions, 32 deletions
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<T> = Option<::std::ptr::NonNull<T>>; /// 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). /// |