diff options
author | Igor Matuszewski <igor@sequoia-pgp.org> | 2020-03-17 12:36:56 +0100 |
---|---|---|
committer | Igor Matuszewski <igor@sequoia-pgp.org> | 2020-03-19 14:39:41 +0100 |
commit | 46e6adeb54a1429b6f24f0eb9c3106803aee4447 (patch) | |
tree | 785e629e0b6b6ddbba8f5f830c2dfe35b7f43e55 | |
parent | 72b6062bfb71510efe880b374cc21aaee36b89eb (diff) |
ipc: Don't use extern crate in 2018 edition
-rw-r--r-- | ipc/src/gnupg.rs | 18 | ||||
-rw-r--r-- | ipc/src/lib.rs | 18 |
2 files changed, 11 insertions, 25 deletions
diff --git a/ipc/src/gnupg.rs b/ipc/src/gnupg.rs index 5d6f848d..4ab52d65 100644 --- a/ipc/src/gnupg.rs +++ b/ipc/src/gnupg.rs @@ -9,16 +9,14 @@ use std::process::Command; use futures::{Async, Future, Stream}; -extern crate libc; -extern crate tempfile; - -use crate::openpgp::types::HashAlgorithm; -use crate::openpgp::fmt::hex; -use crate::openpgp::crypto; -use crate::openpgp::crypto::sexp::Sexp; -use crate::openpgp::packet::prelude::*; -use crate::openpgp::parse::Parse; -use crate::openpgp::serialize::Serialize; +use sequoia_openpgp as openpgp; +use openpgp::types::HashAlgorithm; +use openpgp::fmt::hex; +use openpgp::crypto; +use openpgp::crypto::sexp::Sexp; +use openpgp::packet::prelude::*; +use openpgp::parse::Parse; +use openpgp::serialize::Serialize; use crate::Result; use crate::assuan; diff --git a/ipc/src/lib.rs b/ipc/src/lib.rs index 6adcca98..44415012 100644 --- a/ipc/src/lib.rs +++ b/ipc/src/lib.rs @@ -41,15 +41,6 @@ use std::io::{self, Read, Write}; use std::net::{Ipv4Addr, SocketAddr, TcpStream, TcpListener}; use std::path::PathBuf; -extern crate capnp_rpc; -extern crate fs2; -extern crate futures; -extern crate lalrpop_util; -extern crate memsec; -extern crate tokio; -extern crate tokio_core; -extern crate tokio_io; - use anyhow::Result; use fs2::FileExt; use futures::{Future, Stream}; @@ -70,9 +61,7 @@ use std::os::unix::fs::OpenOptionsExt; use std::process::{Command, Stdio}; use std::thread; -extern crate sequoia_core; -extern crate sequoia_openpgp as openpgp; - +use sequoia_openpgp as openpgp; use sequoia_core as core; #[macro_use] mod trace; @@ -384,9 +373,8 @@ impl Server { /// Cookies are used to authenticate clients. struct Cookie(Vec<u8>); -extern crate rand; -use self::rand::RngCore; -use self::rand::rngs::OsRng; +use rand::RngCore; +use rand::rngs::OsRng; impl Cookie { const SIZE: usize = 32; |