2018 edition (cloudflare#21)

* feat(edition): cargo fix --edition * fix: variable does not need to be mutable * feat(edition): edition=2018, remove externs * fix(style): appease cargo fmt * fix(imports): prepend crate:: * fix(edition): extern macro -> use * feat(edition): remove last externs * fix(edition): un-break cargo bench
lei-cheung · Mar 26, 2019 · 34cc88c · 34cc88c
1 parent 3ec431d
commit 34cc88c
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 77 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,7 @@ authors = ["Vlad Krasnov <[email protected]>"]
 license = "BSD-3-Clause"
 readme = "README.md"
 repository = "https://github.com/cloudflare/boringtun"
+edition = "2018"
 
 [dependencies]
 base64 = "0.9.2"

diff --git a/benches/mod.rs b/benches/mod.rs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 #![feature(test)]
-extern crate boringtun;
 extern crate test;
 
 #[cfg(test)]

diff --git a/src/benchmarks_example.rs b/src/benchmarks_example.rs
@@ -1,13 +1,5 @@
 // Copyright (c) 2019 Cloudflare, Inc. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
-
-#![allow(warnings)]
-extern crate base64;
-extern crate hex;
-extern crate libc;
-extern crate ring;
-extern crate spin;
-
 mod crypto;
 mod ffi;
 mod noise;

diff --git a/src/crypto/blake2s/mod.rs b/src/crypto/blake2s/mod.rs
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 mod tests;
-use noise::errors::*;
-use noise::make_array;
+use crate::noise::errors::*;
+use crate::noise::make_array;
 use std;
 use std::mem;
 use std::ops::AddAssign;

diff --git a/src/crypto/chacha20poly1305/mod.rs b/src/crypto/chacha20poly1305/mod.rs
@@ -5,8 +5,8 @@ mod poly1305;
 mod tests;
 
 use self::poly1305::*;
-use noise::errors::*;
-use noise::make_array;
+use crate::noise::errors::*;
+use crate::noise::make_array;
 use std::ops::AddAssign;
 use std::ops::BitXorAssign;
 use std::ops::ShlAssign;

diff --git a/src/crypto/x25519/mod.rs b/src/crypto/x25519/mod.rs
@@ -3,9 +3,9 @@
 
 mod tests;
 
+use crate::noise::errors::WireGuardError;
+use crate::noise::make_array;
 use base64::decode;
-use noise::errors::WireGuardError;
-use noise::make_array;
 #[cfg(not(target_arch = "arm"))]
 use ring::rand::*;
 use std::ops::Add;

diff --git a/src/device/allowed_ips.rs b/src/device/allowed_ips.rs
@@ -445,7 +445,7 @@ macro_rules! build_iter {
                             ref left,
                             ref right,
                         }) => {
-                            let (mut key, mut bits) = self.key_hlp.pop().unwrap();
+                            let (key, mut bits) = self.key_hlp.pop().unwrap();
                             let cur_key = key ^ (cur_key >> bits);
                             bits += cur_bits;
 

diff --git a/src/device/api.rs b/src/device/api.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 use super::{make_array, AllowedIP, Device, Error, SocketAddr, X25519PublicKey, X25519SecretKey};
-use dev_lock::LockReadGuard;
-use device::drop_privileges::*;
-use device::Action;
+use crate::dev_lock::LockReadGuard;
+use crate::device::drop_privileges::*;
+use crate::device::Action;
 use hex::encode as encode_hex;
 use libc::*;
 use std::fs::{create_dir, remove_file};

diff --git a/src/device/drop_privileges.rs b/src/device/drop_privileges.rs
@@ -1,8 +1,8 @@
 // Copyright (c) 2019 Cloudflare, Inc. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
-use device::errno_str;
-use device::Error;
+use crate::device::errno_str;
+use crate::device::Error;
 use libc::*;
 
 pub fn get_saved_ids() -> Result<(uid_t, gid_t), Error> {

diff --git a/src/device/integration_tests/mod.rs b/src/device/integration_tests/mod.rs
@@ -5,9 +5,9 @@
 // Those tests require docker and sudo priviliges to run
 #[cfg(test)]
 mod tests {
+    use crate::crypto::x25519::*;
+    use crate::device::*;
     use base64::encode as base64encode;
-    use crypto::x25519::*;
-    use device::*;
     use hex::encode;
     #[cfg(not(target_arch = "arm"))]
     use ring::rand::*;

diff --git a/src/device/mod.rs b/src/device/mod.rs
@@ -28,8 +28,8 @@ pub mod tun;
 #[path = "udp_unix.rs"]
 pub mod udp;
 
-use crypto::x25519::*;
-use noise::handshake::parse_handshake_anon;
+use crate::crypto::x25519::*;
+use crate::noise::handshake::parse_handshake_anon;
 use std::collections::HashMap;
 use std::convert::From;
 use std::net::{IpAddr, SocketAddr};
@@ -39,14 +39,14 @@ use std::sync::Arc;
 use std::thread;
 use std::thread::JoinHandle;
 
-use allowed_ips::*;
-use dev_lock::*;
-use noise::errors::*;
-use noise::*;
-use peer::*;
-use poll::*;
-use tun::*;
-use udp::*;
+use crate::allowed_ips::*;
+use crate::dev_lock::*;
+use crate::noise::errors::*;
+use crate::noise::*;
+use crate::peer::*;
+use crate::poll::*;
+use crate::tun::*;
+use crate::udp::*;
 
 const MAX_UDP_SIZE: usize = (1 << 16) - 1;
 const MAX_ITR: usize = 100; // Number of packets to handle per handler call

diff --git a/src/device/peer.rs b/src/device/peer.rs
@@ -1,9 +1,9 @@
 // Copyright (c) 2019 Cloudflare, Inc. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
-use device::udp::UDPSocket;
-use device::*;
-use noise::errors::WireGuardError;
+use crate::device::udp::UDPSocket;
+use crate::device::*;
+use crate::noise::errors::WireGuardError;
 use std::net::IpAddr;
 use std::net::SocketAddr;
 use std::str::FromStr;

diff --git a/src/ffi/benchmark.rs b/src/ffi/benchmark.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 /// This module implements benchmarking code for use with the FFI bindings
-use crypto::blake2s::*;
-use crypto::chacha20poly1305::*;
-use crypto::x25519::*;
+use crate::crypto::blake2s::*;
+use crate::crypto::chacha20poly1305::*;
+use crate::crypto::x25519::*;
 #[cfg(not(target_arch = "arm"))]
 use ring::aead::*;
 #[cfg(not(target_arch = "arm"))]

diff --git a/src/lib.rs b/src/lib.rs
@@ -2,15 +2,8 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 /// Simple implementation of the client side of the WireGuard protocol
-extern crate base64;
-extern crate hex;
 #[cfg(target_os = "android")]
-extern crate jni;
-extern crate libc;
-#[cfg(not(target_arch = "arm"))]
-extern crate ring;
-extern crate spin;
-extern crate untrusted;
+use jni;
 
 #[cfg(target_os = "android")]
 pub mod cfjni;

diff --git a/src/main.rs b/src/main.rs
@@ -1,27 +1,16 @@
 // Copyright (c) 2019 Cloudflare, Inc. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
-extern crate base64;
-extern crate chrono;
-#[macro_use]
-extern crate clap;
-extern crate daemonize;
-extern crate hex;
-extern crate libc;
-#[cfg(not(target_arch = "arm"))]
-extern crate ring;
-extern crate spin;
-
 pub mod crypto;
 mod device;
 pub mod ffi;
 pub mod noise;
 
-use clap::{App, Arg};
+use crate::device::drop_privileges::*;
+use crate::device::*;
+use crate::noise::Verbosity;
+use clap::{value_t, App, Arg};
 use daemonize::Daemonize;
-use device::drop_privileges::*;
-use device::*;
-use noise::Verbosity;
 use std::fs::File;
 use std::os::unix::net::UnixDatagram;
 

diff --git a/src/noise/handshake.rs b/src/noise/handshake.rs
@@ -1,12 +1,12 @@
 // Copyright (c) 2019 Cloudflare, Inc. All rights reserved.
 // SPDX-License-Identifier: BSD-3-Clause
 
-use crypto::blake2s::{constant_time_mac_check, Blake2s};
-use crypto::chacha20poly1305::ChaCha20Poly1305;
-use crypto::x25519::*;
-use noise::errors::WireGuardError;
-use noise::make_array;
-use noise::session::Session;
+use crate::crypto::blake2s::{constant_time_mac_check, Blake2s};
+use crate::crypto::chacha20poly1305::ChaCha20Poly1305;
+use crate::crypto::x25519::*;
+use crate::noise::errors::WireGuardError;
+use crate::noise::make_array;
+use crate::noise::session::Session;
 use std::sync::Arc;
 use std::time::{Duration, Instant, SystemTime};
 

diff --git a/src/noise/mod.rs b/src/noise/mod.rs
@@ -7,10 +7,10 @@ mod session;
 mod tests;
 mod timers;
 
-use crypto::x25519::*;
-use noise::errors::WireGuardError;
-use noise::handshake::Handshake;
-use noise::timers::{TimerName, Timers};
+use crate::crypto::x25519::*;
+use crate::noise::errors::WireGuardError;
+use crate::noise::handshake::Handshake;
+use crate::noise::timers::{TimerName, Timers};
 use std::collections::VecDeque;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
 use std::str::FromStr;

diff --git a/src/noise/session.rs b/src/noise/session.rs
@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 #[cfg(target_arch = "arm")]
-use crypto::chacha20poly1305::*;
-use noise::errors::WireGuardError;
-use noise::make_array;
+use crate::crypto::chacha20poly1305::*;
+use crate::noise::errors::WireGuardError;
+use crate::noise::make_array;
 #[cfg(not(target_arch = "arm"))]
 use ring::aead::*;
 use std::sync::atomic::{AtomicUsize, Ordering};

diff --git a/src/noise/tests/mod.rs b/src/noise/tests/mod.rs
@@ -4,8 +4,8 @@
 #[cfg(test)]
 mod tests {
     use super::super::*;
+    use crate::crypto::x25519::*;
     use base64::encode;
-    use crypto::x25519::*;
     use std::fs;
     use std::fs::File;
     use std::io::prelude::Write;

diff --git a/src/noise/timers.rs b/src/noise/timers.rs
@@ -3,7 +3,7 @@
 
 use self::TimerName::*;
 use super::errors::WireGuardError;
-use noise::{Tunn, TunnResult, Verbosity};
+use crate::noise::{Tunn, TunnResult, Verbosity};
 use std::ops::Index;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};