From 1b3e7f734a613bd787b2bc4bb2d88116ad0541cc Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <tyera@solana.com>
Date: Fri, 1 Feb 2019 10:06:28 -0700
Subject: [PATCH] Update solana-vote-signer to Rust 2018

---
 vote-signer/Cargo.toml      | 7 ++++---
 vote-signer/src/bin/main.rs | 9 +--------
 vote-signer/src/lib.rs      | 1 -
 vote-signer/src/rpc.rs      | 6 +++---
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/vote-signer/Cargo.toml b/vote-signer/Cargo.toml
index 93e11bbb6..d8663eceb 100644
--- a/vote-signer/Cargo.toml
+++ b/vote-signer/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
-name = "solana-vote-signer"
-version = "0.12.0"
-description = "Solana Vote Signing Service"
 authors = ["Solana Maintainers <maintainers@solana.com>"]
+edition = "2018"
+name = "solana-vote-signer"
+description = "Solana Vote Signing Service"
+version = "0.12.0"
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
diff --git a/vote-signer/src/bin/main.rs b/vote-signer/src/bin/main.rs
index 9da4bfe83..c87548cfd 100644
--- a/vote-signer/src/bin/main.rs
+++ b/vote-signer/src/bin/main.rs
@@ -1,11 +1,4 @@
-#[macro_use]
-extern crate clap;
-extern crate log;
-extern crate solana_metrics;
-extern crate solana_sdk;
-extern crate solana_vote_signer;
-
-use clap::{App, Arg};
+use clap::{crate_version, App, Arg};
 use solana_vote_signer::rpc::VoteSignerRpcService;
 use std::error;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
diff --git a/vote-signer/src/lib.rs b/vote-signer/src/lib.rs
index c6dfa42d9..a3d83a00f 100644
--- a/vote-signer/src/lib.rs
+++ b/vote-signer/src/lib.rs
@@ -1,6 +1,5 @@
 pub mod rpc;
 
-extern crate bs58;
 #[macro_use]
 extern crate log;
 extern crate solana_jsonrpc_core as jsonrpc_core;
diff --git a/vote-signer/src/rpc.rs b/vote-signer/src/rpc.rs
index 843e8ab8e..28b1d725a 100644
--- a/vote-signer/src/rpc.rs
+++ b/vote-signer/src/rpc.rs
@@ -1,7 +1,7 @@
 //! The `rpc` module implements the Vote signing service RPC interface.
 
-use jsonrpc_core::*;
-use jsonrpc_http_server::*;
+use crate::jsonrpc_core::*;
+use crate::jsonrpc_http_server::*;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
 use std::collections::HashMap;
@@ -178,7 +178,7 @@ impl Default for LocalVoteSigner {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use jsonrpc_core::Response;
+    use crate::jsonrpc_core::Response;
     use solana_sdk::signature::{Keypair, KeypairUtil};
     use std::mem;