Rust 2018 cleanup

programs/native/bpf_loader/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+edition = "2018"
 
 [features]
 bpf_c = []

programs/native/bpf_loader/src/lib.rs

@@ -1,20 +1,14 @@
 pub mod bpf_verifier;
 
-extern crate byteorder;
-#[macro_use]
-extern crate log;
-extern crate libc;
-extern crate solana_rbpf;
-#[macro_use]
-extern crate solana_sdk;
-
 use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
 use libc::c_char;
+use log::*;
 use solana_rbpf::EbpfVmRaw;
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::loader_instruction::LoaderInstruction;
 use solana_sdk::native_program::ProgramError;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::solana_entrypoint;
 use std::ffi::CStr;
 use std::io::prelude::*;
 use std::io::{Error, ErrorKind};

programs/native/budget/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+edition = "2018"
 
 [dependencies]
 bincode = "1.0.0"

programs/native/budget/src/budget_program.rs

@@ -1,6 +1,8 @@
 //! budget program
 use bincode::{self, deserialize, serialize_into, serialized_size};
 use chrono::prelude::{DateTime, Utc};
+use log::*;
+use serde_derive::{Deserialize, Serialize};
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::budget_expr::BudgetExpr;
 use solana_sdk::budget_instruction::Instruction;

programs/native/budget/src/lib.rs

@@ -1,19 +1,11 @@
-extern crate bincode;
-extern crate chrono;
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
-#[macro_use]
-extern crate solana_sdk;
-
 mod budget_program;
 
+use crate::budget_program::process_instruction;
+use log::*;
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::native_program::ProgramError;
 use solana_sdk::pubkey::Pubkey;
-
-use budget_program::process_instruction;
+use solana_sdk::solana_entrypoint;
 
 solana_entrypoint!(entrypoint);
 fn entrypoint(

programs/native/erc20/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+edition = "2018"
 
 [dependencies]
 bincode = "1.0.0"

programs/native/erc20/src/lib.rs

@@ -1,17 +1,10 @@
 //! The `erc20` library implements a generic erc20-like token
 
-extern crate bincode;
-#[macro_use]
-extern crate log;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-#[macro_use]
-extern crate solana_sdk;
-
+use log::*;
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::native_program::ProgramError;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::solana_entrypoint;
 
 mod token_program;
 

programs/native/erc20/src/token_program.rs

@@ -1,7 +1,8 @@
 //! ERC20-like Token
 
 use bincode;
-
+use log::*;
+use serde_derive::{Deserialize, Serialize};
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::pubkey::Pubkey;
 use std;

programs/native/lua_loader/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+edition = "2018"
 
 [dependencies]
 bincode = "1.0.0"

programs/native/lua_loader/src/lib.rs

@@ -1,14 +1,10 @@
-#[macro_use]
-extern crate log;
-extern crate rlua;
-#[macro_use]
-extern crate solana_sdk;
-
+use log::*;
 use rlua::{Lua, Table};
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::loader_instruction::LoaderInstruction;
 use solana_sdk::native_program::ProgramError;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::solana_entrypoint;
 use std::str;
 
 /// Make KeyAccount values available to Lua.
@@ -116,10 +112,8 @@ fn entrypoint(
 
 #[cfg(test)]
 mod tests {
-    extern crate bincode;
-
-    use self::bincode::serialize;
     use super::*;
+    use bincode::serialize;
     use solana_sdk::account::{create_keyed_accounts, Account};
     use solana_sdk::pubkey::Pubkey;
     use std::fs::File;

programs/native/native_loader/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+edition = "2018"
 
 [dependencies]
 bincode = "1.0.0"

programs/native/native_loader/src/lib.rs

@@ -1,16 +1,10 @@
 //! Native loader
-extern crate bincode;
-extern crate libc;
-extern crate libloading;
-#[macro_use]
-extern crate log;
-extern crate solana_sdk;
-
 use bincode::deserialize;
 #[cfg(unix)]
 use libloading::os::unix::*;
 #[cfg(windows)]
 use libloading::os::windows::*;
+use log::*;
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::loader_instruction::LoaderInstruction;
 pub use solana_sdk::native_loader::*;

programs/native/noop/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+edition = "2018"
 
 [dependencies]
 solana-sdk = { path = "../../../sdk", version = "0.11.0" }

programs/native/noop/src/lib.rs

@@ -1,9 +1,7 @@
-#[macro_use]
-extern crate solana_sdk;
-
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::native_program::ProgramError;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::solana_entrypoint;
 
 solana_entrypoint!(entrypoint);
 fn entrypoint(

programs/native/storage/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+edition = "2018"
 
 [dependencies]
 bincode = "1.0.0"

programs/native/storage/src/lib.rs

@@ -2,14 +2,11 @@
 //!  Receive mining proofs from miners, validate the answers
 //!  and give reward for good proofs.
 
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate solana_sdk;
-
+use log::*;
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::native_program::ProgramError;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::solana_entrypoint;
 use solana_sdk::storage_program::*;
 
 solana_entrypoint!(entrypoint);

programs/native/system/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+edition = "2018"
 
 [dependencies]
 bincode = "1.0.0"

programs/native/system/src/lib.rs

@@ -1,11 +1,8 @@
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate solana_sdk;
-
+use log::*;
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::native_program::ProgramError;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::solana_entrypoint;
 use solana_sdk::system_instruction::SystemInstruction;
 use solana_sdk::system_program;
 

programs/native/vote/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
 repository = "https://github.com/solana-labs/solana"
 license = "Apache-2.0"
 homepage = "https://solana.com/"
+edition = "2018"
 
 [dependencies]
 bincode = "1.0.0"

programs/native/vote/src/lib.rs

@@ -1,14 +1,11 @@
 //! Vote program
 //! Receive and processes votes from validators
 
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate solana_sdk;
-
+use log::*;
 use solana_sdk::account::KeyedAccount;
 use solana_sdk::native_program::ProgramError;
 use solana_sdk::pubkey::Pubkey;
+use solana_sdk::solana_entrypoint;
 use solana_sdk::vote_program::*;
 use std::collections::VecDeque;
 
@@ -39,7 +36,7 @@ fn entrypoint(
 
             // TODO: a single validator could register multiple "vote accounts"
             // which would clutter the "accounts" structure. See github issue 1654.
-            let mut vote_state = VoteProgram {
+            let vote_state = VoteProgram {
                 votes: VecDeque::new(),
                 node_id: *keyed_accounts[0].signer_key().unwrap(),
             };