more edition-2018 cleanups

* remove "extern crate" and "macro_use"
* rearrange use statements

examples/readline-core.rs

@@ -1,12 +1,14 @@
-use rustyline;
-
-use ws;
-
 use magic_wormhole::core::{
     APIAction, APIEvent, Action, IOAction, IOEvent, OfferType, PeerMessage,
     WSHandle, WormholeCore,
 };
-
+use parking_lot::{deadlock, Mutex};
+use regex::Regex;
+use rustyline;
+use rustyline::{
+    completion::Completer, error::ReadlineError, highlight::Highlighter,
+    hint::Hinter, Helper,
+};
 use std::error::Error;
 use std::io;
 use std::sync::{
@@ -15,14 +17,8 @@ use std::sync::{
 };
 use std::thread::{sleep, spawn};
 use std::time::Duration;
-
-use parking_lot::{deadlock, Mutex};
-use regex::Regex;
-use rustyline::{
-    completion::Completer, error::ReadlineError, highlight::Highlighter,
-    hint::Hinter, Helper,
-};
 use url::Url;
+use ws;
 
 const MAILBOX_SERVER: &'static str = "ws://localhost:4000/v1";
 const APPID: &'static str = "lothar.com/wormhole/text-or-file-xfer";

examples/receive-blocking.rs

@@ -1,5 +1,4 @@
 use hex;
-
 use magic_wormhole::core::{file_ack, message_ack, OfferType, PeerMessage};
 use magic_wormhole::io::blocking::Wormhole;
 use std::str;

examples/send-blocking.rs

@@ -1,5 +1,4 @@
 use hex;
-
 use magic_wormhole::core::message;
 use magic_wormhole::io::blocking::Wormhole;
 

src/core/boss.rs

@@ -1,6 +1,7 @@
 use super::api::Mood;
 use super::events::{Code, Events, Nameplate, Phase};
 use super::wordlist::default_wordlist;
+use serde_json::json;
 use std::str::FromStr;
 use std::sync::Arc;
 

src/core/key.rs

@@ -1,6 +1,7 @@
 use hex;
-
 use hkdf::Hkdf;
+use serde_derive::{Deserialize, Serialize};
+use serde_json::json;
 use serde_json::{self, Value};
 use sha2::{Digest, Sha256};
 use sodiumoxide;

src/core/rendezvous.rs

@@ -7,8 +7,6 @@
 // in Twisted, we delegate all of this to a ClientService, so there's a lot
 // more code and more states here
 
-use hex;
-
 use super::api::{TimerHandle, WSHandle};
 use super::events::{
     AppID, Events, Mailbox, MySide, Nameplate, Phase, TheirSide,
@@ -17,6 +15,7 @@ use super::server_messages::{
     add, allocate, bind, claim, close, deserialize, list, open, release,
     InboundMessage, OutboundMessage,
 };
+use hex;
 use serde_json;
 // we process these
 use super::api::IOEvent;

src/core/server_messages.rs

@@ -1,8 +1,8 @@
-use serde_json::{self, Value};
-
 use super::api::Mood;
 use super::events::{AppID, Mailbox, MySide};
 use super::util;
+use serde_derive::{Deserialize, Serialize};
+use serde_json::{self, Value};
 
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
 pub struct Nameplate {
@@ -123,6 +123,7 @@ mod test {
     use super::*;
     use crate::core::api::Mood;
     use serde_json::from_str;
+    use serde_json::json;
 
     #[test]
     fn test_bind() {

src/core/transfer.rs

@@ -1,4 +1,5 @@
-use serde_json;
+use serde_derive::{Deserialize, Serialize};
+use serde_json::json;
 
 #[derive(Deserialize, Serialize, Debug, PartialEq)]
 #[serde(rename_all = "kebab-case")]

src/lib.rs

@@ -1,12 +1,7 @@
 #![forbid(unsafe_code)]
 #![deny(warnings)]
 
-#[macro_use]
-extern crate serde_derive;
-#[macro_use]
-extern crate serde_json;
 use hex;
-
 use sodiumoxide;
 
 pub mod core;