Merge pull request #2442 from suchapalaver/update-edition-to-rust-2021

Update edition to rust 2021

Author: vaporos

adm/Cargo.toml

@@ -18,6 +18,7 @@ name = "sawtooth-sawadm"
 version = "0.1.0"
 authors = ["sawtooth"]
 description = "The sawadm command is used for Sawtooth administration tasks."
+edition = '2021'
 
 [[bin]]
 name = "sawadm"

adm/src/blockstore.rs

@@ -15,11 +15,11 @@
  * ------------------------------------------------------------------------------
  */
 
-use proto::block::{Block, BlockHeader};
+use crate::proto::block::{Block, BlockHeader};
 use protobuf::Message;
 
-use database::error::DatabaseError;
-use database::lmdb::LmdbDatabase;
+use crate::database::error::DatabaseError;
+use crate::database::lmdb::LmdbDatabase;
 
 pub struct Blockstore<'a> {
     db: LmdbDatabase<'a>,
@@ -207,10 +207,10 @@ impl<'a> Blockstore<'a> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use config;
-    use database::lmdb::LmdbContext;
-    use proto::batch::{Batch, BatchHeader};
-    use proto::transaction::Transaction;
+    use crate::config;
+    use crate::database::lmdb::LmdbContext;
+    use crate::proto::batch::{Batch, BatchHeader};
+    use crate::proto::transaction::Transaction;
 
     /// Asserts that BLOCKSTORE has a current height of COUNT.
     fn assert_current_height(count: usize, blockstore: &Blockstore) {

adm/src/commands/blockstore.rs

@@ -24,15 +24,15 @@ use protobuf;
 use protobuf::Message;
 use serde_yaml;
 
-use proto::block::{Block, BlockHeader};
-use proto::transaction::TransactionHeader;
-
-use blockstore::Blockstore;
-use config;
-use database::error::DatabaseError;
-use database::lmdb;
-use err::CliError;
-use wrappers::Block as BlockWrapper;
+use crate::proto::block::{Block, BlockHeader};
+use crate::proto::transaction::TransactionHeader;
+
+use crate::blockstore::Blockstore;
+use crate::config;
+use crate::database::error::DatabaseError;
+use crate::database::lmdb;
+use crate::err::CliError;
+use crate::wrappers::Block as BlockWrapper;
 
 const NULL_BLOCK_IDENTIFIER: &str = "0000000000000000";
 

adm/src/commands/genesis.rs

@@ -24,13 +24,13 @@ use clap::ArgMatches;
 use protobuf;
 use protobuf::Message;
 
-use proto::batch::{Batch, BatchList};
-use proto::genesis::GenesisData;
-use proto::settings::{SettingProposal, SettingsPayload, SettingsPayload_Action};
-use proto::transaction::TransactionHeader;
+use crate::proto::batch::{Batch, BatchList};
+use crate::proto::genesis::GenesisData;
+use crate::proto::settings::{SettingProposal, SettingsPayload, SettingsPayload_Action};
+use crate::proto::transaction::TransactionHeader;
 
-use config;
-use err::CliError;
+use crate::config;
+use crate::err::CliError;
 
 pub fn run(args: &ArgMatches) -> Result<(), CliError> {
     let genesis_file_path = if args.is_present("output") {
@@ -177,8 +177,8 @@ mod tests {
 
     use protobuf::RepeatedField;
 
-    use proto::batch::BatchHeader;
-    use proto::transaction::Transaction;
+    use crate::proto::batch::BatchHeader;
+    use crate::proto::transaction::Transaction;
 
     fn get_required_settings_batch() -> Batch {
         let required_settings = vec![

adm/src/commands/keygen.rs

@@ -30,8 +30,8 @@ use libc;
 
 use sawtooth_sdk::signing;
 
-use config;
-use err::CliError;
+use crate::config;
+use crate::err::CliError;
 
 pub fn run(args: &ArgMatches) -> Result<(), CliError> {
     let path_config = config::get_path_config();

adm/src/database/lmdb.rs

@@ -20,7 +20,7 @@ use std::path::Path;
 
 use lmdb_zero as lmdb;
 
-use database::error::DatabaseError;
+use crate::database::error::DatabaseError;
 
 const DEFAULT_SIZE: usize = 1 << 40; // 1024 ** 4
 
@@ -234,7 +234,7 @@ impl<'a> LmdbDatabaseWriter<'a> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use config;
+    use crate::config;
 
     /// Asserts that there are COUNT many objects in DB.
     fn assert_database_count(count: usize, db: &LmdbDatabase) {

adm/src/err.rs

@@ -15,8 +15,6 @@
  * ------------------------------------------------------------------------------
  */
 
-use std;
-
 #[allow(clippy::enum_variant_names)]
 #[derive(Debug)]
 pub enum CliError {

adm/src/wrappers.rs

@@ -14,11 +14,9 @@
  * limitations under the License.
  * ------------------------------------------------------------------------------
  */
-use std;
-
 use protobuf::Message;
 
-use proto;
+use crate::proto;
 
 #[derive(Debug)]
 pub enum Error {

families/battleship/Cargo.toml

@@ -16,6 +16,7 @@
 name = "battleship"
 version = "0.1.0"
 authors = ["Bitwise IO, Inc."]
+edition = '2021'
 
 [[example]]
 name = "play"

families/battleship/src/client.rs

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use crate::game::{Action, Game};
+use crate::transaction_builder::TransactionBuilder;
 use base64::{engine::general_purpose, Engine as _};
 use dirs::home_dir;
 use failure::Error;
-use game::{Action, Game};
 use reqwest::{Client, Url};
 use sawtooth_sdk::signing::secp256k1::Secp256k1PrivateKey;
 use sawtooth_sdk::signing::{create_context, PrivateKey, Signer};
@@ -26,7 +27,6 @@ use std::io::Read;
 use std::path::PathBuf;
 use std::thread::sleep;
 use std::time::Duration;
-use transaction_builder::TransactionBuilder;
 
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Deserialize, Debug)]