Bump rust version up to 1.43.0 (exonum#1869)

a0x8o · May 19, 2020 · fbc3d17 · fbc3d17
1 parent f8b6c32
commit fbc3d17
Show file tree

Hide file tree

Showing 158 changed files with 656 additions and 546 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,7 +41,7 @@ addons:
     - zlib1g-dev
 
 rust:
-  - 1.42.0
+  - 1.43.0
 
 cache:
   npm: true
@@ -89,7 +89,7 @@ jobs:
     - npm run cspell
     - npm run md
     # Clippy lints.
-    - cargo clippy --all --tests --examples --benches --all-features
+    - cargo clippy --all-targets --all-features
     # Other cargo lints.
     - cargo fmt --all -- --check
     - cargo clean --doc

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![Docs.rs](https://docs.rs/exonum/badge.svg)](https://docs.rs/exonum)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](LICENSE.md)
 [![LoC](https://tokei.rs/b1/github/exonum/exonum)](https://github.com/exonum/exonum)
-![rust 1.42.0+ required](https://img.shields.io/badge/rust-1.42.0+-blue.svg?label=Required%20Rust)
+![rust 1.43.0+ required](https://img.shields.io/badge/rust-1.43.0+-blue.svg?label=Required%20Rust)
 
 **Community:**
 [![Join the chat at https://gitter.im/exonum/exonum](https://img.shields.io/gitter/room/exonum/exonum.svg?label=Chat)](https://gitter.im/exonum/exonum)
@@ -91,7 +91,7 @@ versioning limitations.
 
 ## Supported Rust Versions
 
-The Exonum crates are built against a specific stable Rust version (1.42.0).
+The Exonum crates are built against a specific stable Rust version (1.43.0).
 Newer stable versions are supported as a result. (Feel free to file an issue
 if any Exonum crate does not build on a newer stable version.)
 Newer beta and nightly versions *should* be supported as well,

diff --git a/cli/README.md b/cli/README.md
@@ -2,7 +2,7 @@
 
 [![Travis Build Status](https://img.shields.io/travis/exonum/exonum/master.svg?label=Linux%20Build)](https://travis-ci.com/exonum/exonum)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](https://github.com/exonum/exonum/blob/master/LICENSE)
-![rust 1.42.0+ required](https://img.shields.io/badge/rust-1.42.0+-blue.svg?label=Required%20Rust)
+![rust 1.43.0+ required](https://img.shields.io/badge/rust-1.43.0+-blue.svg?label=Required%20Rust)
 
 `exonum-cli` crate provides an extensible command line interface for Exonum
 nodes.

diff --git a/cli/src/command/generate_template.rs b/cli/src/command/generate_template.rs
@@ -18,9 +18,8 @@ use anyhow::Error;
 use exonum::blockchain::ConsensusConfig;
 use exonum_supervisor::mode::Mode as SupervisorMode;
 use serde_derive::{Deserialize, Serialize};
-use structopt::StructOpt;
-
 use std::path::PathBuf;
+use structopt::StructOpt;
 
 use crate::{
     command::{ExonumCommand, StandardResult},

diff --git a/cli/src/command/maintenance.rs b/cli/src/command/maintenance.rs
@@ -19,9 +19,8 @@ use exonum::merkledb::{migration::rollback_migration, Database, RocksDB};
 use exonum::runtime::remove_local_migration_result;
 use exonum_node::helpers::clear_consensus_messages_cache;
 use serde_derive::{Deserialize, Serialize};
-use structopt::StructOpt;
-
 use std::path::{Path, PathBuf};
+use structopt::StructOpt;
 
 use crate::{
     command::{ExonumCommand, StandardResult},

diff --git a/cli/src/command/run.rs b/cli/src/command/run.rs
@@ -18,12 +18,11 @@
 use anyhow::Error;
 use exonum::keys::{read_keys_from_file, Keys};
 use serde_derive::{Deserialize, Serialize};
-use structopt::StructOpt;
-
 use std::{
     net::SocketAddr,
     path::{Path, PathBuf},
 };
+use structopt::StructOpt;
 
 use crate::{
     command::{ExonumCommand, StandardResult},

diff --git a/cli/src/command/run_dev.rs b/cli/src/command/run_dev.rs
@@ -18,9 +18,8 @@
 use anyhow::{Context, Error};
 use exonum_supervisor::mode::Mode as SupervisorMode;
 use serde_derive::{Deserialize, Serialize};
-use structopt::StructOpt;
-
 use std::{fs, net::SocketAddr, path::PathBuf, str::FromStr};
+use structopt::StructOpt;
 
 use crate::command::{
     finalize::Finalize,

diff --git a/cli/src/config_manager.rs b/cli/src/config_manager.rs
@@ -16,7 +16,6 @@
 
 use exonum_node::{ConfigManager, ConnectListConfig};
 use log::error;
-
 use std::{path::Path, sync::mpsc, thread};
 
 use crate::{

diff --git a/cli/src/io.rs b/cli/src/io.rs
@@ -16,7 +16,6 @@
 
 use anyhow::{Context, Error};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
-
 use std::{
     fs::{self, File},
     io::{Read, Write},

diff --git a/components/api/README.md b/components/api/README.md
@@ -2,7 +2,7 @@
 
 [![Travis Build Status](https://img.shields.io/travis/exonum/exonum/master.svg?label=Linux%20Build)](https://travis-ci.com/exonum/exonum)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](https://github.com/exonum/exonum/blob/master/LICENSE)
-![rust 1.42.0+ required](https://img.shields.io/badge/rust-1.42.0+-blue.svg?label=Required%20Rust)
+![rust 1.43.0+ required](https://img.shields.io/badge/rust-1.43.0+-blue.svg?label=Required%20Rust)
 
 `exonum-api` crate provides an extensible interface for building backend-agnostic
 HTTP APIs.

diff --git a/components/api/src/cors.rs b/components/api/src/cors.rs
@@ -14,7 +14,6 @@
 
 use anyhow::bail;
 use serde::{de, ser};
-
 use std::{fmt, str::FromStr};
 
 /// CORS header specification.

diff --git a/components/api/src/error.rs b/components/api/src/error.rs
@@ -19,9 +19,8 @@ pub use actix_web::http::{
     HeaderMap, StatusCode as HttpStatusCode,
 };
 use serde::{Deserialize, Serialize};
-use thiserror::Error;
-
 use std::fmt;
+use thiserror::Error;
 
 /// API HTTP error struct.
 #[derive(Error, Debug)]

diff --git a/components/api/src/lib.rs b/components/api/src/lib.rs
@@ -75,7 +75,6 @@ mod manager;
 mod with;
 
 use serde::{de::DeserializeOwned, Serialize};
-
 use std::{collections::BTreeMap, fmt, future::Future};
 
 use crate::backends::actix;

diff --git a/components/api/src/with.rs b/components/api/src/with.rs
@@ -16,7 +16,7 @@ use chrono::{DateTime, Utc};
 
 use std::{future::Future, marker::PhantomData};
 
-use super::{error, EndpointMutability};
+use crate::{error, EndpointMutability};
 
 /// Type alias for the usual synchronous result.
 pub type Result<I> = std::result::Result<I, error::Error>;

diff --git a/components/build/README.md b/components/build/README.md
@@ -2,7 +2,7 @@
 
 [![Travis Build Status](https://img.shields.io/travis/exonum/exonum/master.svg?label=Linux%20Build)](https://travis-ci.com/exonum/exonum)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](https://github.com/exonum/exonum/blob/master/LICENSE)
-![rust 1.42.0+ required](https://img.shields.io/badge/rust-1.42.0+-blue.svg?label=Required%20Rust)
+![rust 1.43.0+ required](https://img.shields.io/badge/rust-1.43.0+-blue.svg?label=Required%20Rust)
 
 This crate simplifies writing build scripts for Exonum and Exonum services.
 

diff --git a/components/build/src/lib.rs b/components/build/src/lib.rs
@@ -58,15 +58,14 @@
 use proc_macro2::{Ident, Span, TokenStream};
 use protoc_rust::Customize;
 use quote::{quote, ToTokens};
-use walkdir::WalkDir;
-
-use std::collections::HashSet;
 use std::{
+    collections::HashSet,
     env,
     fs::File,
     io::{Read, Write},
     path::{Path, PathBuf},
 };
+use walkdir::WalkDir;
 
 /// Enum representing various sources of Protobuf files.
 #[derive(Debug, Copy, Clone)]

diff --git a/components/crypto/README.md b/components/crypto/README.md
@@ -2,7 +2,7 @@
 
 [![Travis Build Status](https://img.shields.io/travis/exonum/exonum/master.svg?label=Linux%20Build)](https://travis-ci.com/exonum/exonum)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](https://github.com/exonum/exonum/blob/master/LICENSE)
-![rust 1.42.0+ required](https://img.shields.io/badge/rust-1.42.0+-blue.svg?label=Required%20Rust)
+![rust 1.43.0+ required](https://img.shields.io/badge/rust-1.43.0+-blue.svg?label=Required%20Rust)
 
 `exonum-crypto` provides a high-level API for work with various cryptography tasks.
 

diff --git a/components/crypto/src/lib.rs b/components/crypto/src/lib.rs
@@ -550,7 +550,11 @@ fn verify_keys_match(public_key: &PublicKey, secret_key: &SecretKey) -> bool {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use super::{
+        fmt, gen_keypair, hash, Hash, HashStream, KeyPair, PublicKey, SecretKey, Seed, Serialize,
+        SignStream, Signature, HASH_SIZE, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH, SEED_LENGTH,
+        SIGNATURE_LENGTH,
+    };
 
     use hex::FromHex;
     use serde::de::DeserializeOwned;

diff --git a/components/derive/README.md b/components/derive/README.md
@@ -2,7 +2,7 @@
 
 [![Travis Build Status](https://img.shields.io/travis/exonum/exonum/master.svg?label=Linux%20Build)](https://travis-ci.com/exonum/exonum)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](https://github.com/exonum/exonum/blob/master/LICENSE)
-![rust 1.42.0+ required](https://img.shields.io/badge/rust-1.42.0+-blue.svg?label=Required%20Rust)
+![rust 1.43.0+ required](https://img.shields.io/badge/rust-1.43.0+-blue.svg?label=Required%20Rust)
 
 This crate provides several procedural macros for Exonum core and Exonum services.
 

diff --git a/components/derive/src/execution_fail.rs b/components/derive/src/execution_fail.rs
@@ -20,7 +20,7 @@ use syn::{Attribute, Data, DeriveInput, Expr, Lit, Meta, MetaNameValue, Variant}
 
 use std::convert::TryFrom;
 
-use super::{find_meta_attrs, MainCratePath};
+use crate::{find_meta_attrs, MainCratePath};
 
 #[derive(Debug, FromMeta)]
 #[darling(default)]

diff --git a/components/derive/src/exonum_interface.rs b/components/derive/src/exonum_interface.rs
@@ -16,16 +16,13 @@ use darling::{self, FromMeta};
 use proc_macro::TokenStream;
 use proc_macro2::Span;
 use quote::{quote, ToTokens};
+use std::{collections::HashSet, convert::TryFrom, str::FromStr};
 use syn::{
     parse_macro_input, spanned::Spanned, Attribute, AttributeArgs, FnArg, Ident, ItemTrait, Lit,
     NestedMeta, Receiver, ReturnType, TraitItem, TraitItemMethod, Type,
 };
 
-use std::collections::HashSet;
-use std::convert::TryFrom;
-use std::str::FromStr;
-
-use super::{find_meta_attrs, RustRuntimeCratePath};
+use crate::{find_meta_attrs, RustRuntimeCratePath};
 
 #[derive(Debug)]
 struct ServiceMethodDescriptor {

diff --git a/components/derive/src/service_dispatcher.rs b/components/derive/src/service_dispatcher.rs
@@ -17,7 +17,7 @@ use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
 use syn::{DeriveInput, Generics, Ident, Lit, Meta, NestedMeta, Path};
 
-use super::RustRuntimeCratePath;
+use crate::RustRuntimeCratePath;
 
 #[derive(Debug)]
 struct ServiceInterface {

diff --git a/components/derive/src/service_factory.rs b/components/derive/src/service_factory.rs
@@ -18,7 +18,7 @@ use quote::{quote, ToTokens};
 use semver::Version;
 use syn::{DeriveInput, Generics, Ident, Path};
 
-use super::RustRuntimeCratePath;
+use crate::RustRuntimeCratePath;
 
 fn is_allowed_artifact_name_char(c: u8) -> bool {
     match c {

diff --git a/components/explorer/README.md b/components/explorer/README.md
@@ -2,7 +2,7 @@
 
 [![Travis Build Status](https://img.shields.io/travis/exonum/exonum/master.svg?label=Linux%20Build)](https://travis-ci.com/exonum/exonum)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](https://github.com/exonum/exonum/blob/master/LICENSE)
-![rust 1.42.0+ required](https://img.shields.io/badge/rust-1.42.0+-blue.svg?label=Required%20Rust)
+![rust 1.43.0+ required](https://img.shields.io/badge/rust-1.43.0+-blue.svg?label=Required%20Rust)
 
 `exonum-explorer` provides explorer API
 for the [Exonum blockchain framework](https://exonum.com/). For example,

diff --git a/components/explorer/examples/explorer.rs b/components/explorer/examples/explorer.rs
@@ -26,7 +26,9 @@ use serde_json::json;
 
 use std::{collections::BTreeMap, iter};
 
-use exonum_explorer::*;
+use exonum_explorer::{
+    BlockInfo, BlockWithTransactions, BlockchainExplorer, CommittedTransaction, TransactionInfo,
+};
 
 #[path = "../tests/blockchain/mod.rs"]
 mod blockchain;

diff --git a/components/explorer/src/api.rs b/components/explorer/src/api.rs
@@ -27,7 +27,6 @@ use exonum::{
     runtime::{AnyTx, CallInfo, ExecutionStatus, InstanceId},
 };
 use serde_derive::{Deserialize, Serialize};
-
 use std::ops::Range;
 
 use crate::median_precommits_time;

diff --git a/components/explorer/src/api/websocket.rs b/components/explorer/src/api/websocket.rs
@@ -22,11 +22,9 @@ use exonum::{
     runtime::{ExecutionStatus, InstanceId, MethodId},
 };
 use serde_derive::{Deserialize, Serialize};
-
 use std::fmt;
 
-use super::TransactionHex;
-use crate::median_precommits_time;
+use crate::{api::TransactionHex, median_precommits_time};
 
 /// Messages proactively sent by WebSocket clients to the server.
 #[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]

diff --git a/components/explorer/src/lib.rs b/components/explorer/src/lib.rs
@@ -60,8 +60,7 @@ use exonum::{
     runtime::{ExecutionError, ExecutionStatus},
 };
 use serde::{Serialize, Serializer};
-use serde_derive::*;
-
+use serde_derive::Deserialize;
 use std::{
     cell::{Ref, RefCell},
     collections::{BTreeMap, Bound},

diff --git a/components/explorer/tests/explorer.rs b/components/explorer/tests/explorer.rs
@@ -22,13 +22,14 @@ use exonum::{
     messages::{AnyTx, Verified},
     runtime::{ErrorKind, SnapshotExt},
 };
+use exonum_explorer::{
+    BlockInfo, BlockWithTransactions, BlockchainExplorer, CommittedTransaction, TransactionInfo,
+};
 use serde_json::json;
-
 use std::iter;
 
-use exonum_explorer::*;
-
 mod blockchain;
+
 use self::blockchain::{
     create_block, create_blockchain, CreateWallet, ExplorerTransactions, Transfer, SERVICE_ID,
 };

diff --git a/components/keys/README.md b/components/keys/README.md
@@ -2,7 +2,7 @@
 
 [![Travis Build Status](https://img.shields.io/travis/exonum/exonum/master.svg?label=Linux%20Build)](https://travis-ci.com/exonum/exonum)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](https://github.com/exonum/exonum/blob/master/LICENSE)
-![rust 1.42.0+ required](https://img.shields.io/badge/rust-1.42.0+-blue.svg?label=Required%20Rust)
+![rust 1.43.0+ required](https://img.shields.io/badge/rust-1.43.0+-blue.svg?label=Required%20Rust)
 
 `exonum-keys` provides tools for storing and loading encrypted keys for
 Exonum nodes.

diff --git a/components/keys/examples/key_generator.rs b/components/keys/examples/key_generator.rs
@@ -12,8 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use exonum_keys::*;
-use hex;
+use exonum_keys::generate_keys_from_seed;
 use serde_json::json;
 use structopt::StructOpt;
 
@@ -56,6 +55,7 @@ fn generate_json(passphrase: &str, seed: &str) -> anyhow::Result<serde_json::Val
 
 #[test]
 fn test_key_generator() {
+    use exonum_keys::read_keys_from_file;
     #[cfg(unix)]
     use std::os::unix::fs::OpenOptionsExt;
     use std::{fs::OpenOptions, io::Write};

diff --git a/components/keys/src/lib.rs b/components/keys/src/lib.rs
@@ -250,7 +250,10 @@ pub fn read_keys_from_file<P: AsRef<Path>, W: AsRef<[u8]>>(
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use super::{
+        generate_keys, read_keys_from_file, thread_rng, validate_file_mode, EncryptedMasterKey,
+        SecretTree,
+    };
     use tempdir::TempDir;
 
     #[test]

diff --git a/components/merkledb/README.md b/components/merkledb/README.md
@@ -2,7 +2,7 @@
 
 [![Travis Build Status](https://img.shields.io/travis/exonum/exonum/master.svg?label=Linux%20Build)](https://travis-ci.com/exonum/exonum)
 [![Docs.rs](https://docs.rs/exonum-merkledb/badge.svg)](https://docs.rs/exonum-merkledb)
-![rust 1.42.0+ required](https://img.shields.io/badge/rust-1.42.0+-blue.svg?label=Required%20Rust)
+![rust 1.43.0+ required](https://img.shields.io/badge/rust-1.43.0+-blue.svg?label=Required%20Rust)
 [![License: Apache-2.0](https://img.shields.io/github/license/exonum/exonum.svg)](https://github.com/exonum/exonum/components/merkledb/blob/master/LICENSE)
 
 **MerkleDB** is a document-oriented persistent storage

diff --git a/components/merkledb/examples/manual_migration.rs b/components/merkledb/examples/manual_migration.rs
@@ -27,10 +27,10 @@
 use exonum_merkledb::{
     access::Prefixed, migration::Migration, Database, Fork, ObjectHash, ReadonlyFork,
 };
-
 use std::sync::Arc;
 
 mod migration;
+
 use crate::migration::{perform_migration, v1, v2};
 
 /// Provides migration of wallets with schema.