Update hex-literal version, simplify imports and remove unused dependencies (#2371)

substrate/core/executor/Cargo.toml

@@ -25,7 +25,7 @@ tiny-keccak = "1.4.2"
 [dev-dependencies]
 assert_matches = "1.1"
 wabt = "~0.7.4"
-hex-literal = "0.1.0"
+hex-literal = "0.2.0"
 
 [features]
 default = []

substrate/core/executor/src/wasm_executor.rs

@@ -897,7 +897,7 @@ mod tests {
 	use parity_codec::Encode;
 
 	use state_machine::TestExternalities;
-	use hex_literal::{hex, hex_impl};
+	use hex_literal::hex;
 	use primitives::map;
 
 	#[test]

substrate/core/keyring/Cargo.toml

@@ -7,7 +7,6 @@ edition = "2018"
 [dependencies]
 substrate-primitives = { path = "../primitives" }
 sr-primitives = { path = "../sr-primitives" }
-hex-literal = { version = "0.1.0" }
 lazy_static = { version = "1.0" }
 strum = "0.14.0"
 strum_macros = "0.14.0"

substrate/core/primitives/Cargo.toml

@@ -18,7 +18,6 @@ hash-db = { version = "0.12", default-features = false }
 hash256-std-hasher = { version = "0.12", default-features = false }
 ring = { version = "0.14", optional = true }
 untrusted = { version = "0.6", optional = true }
-hex-literal = { version = "0.1", optional = true }
 base58 = { version = "0.1", optional = true }
 blake2-rfc = { version = "0.2.18", optional = true }
 schnorrkel = { version = "0.1", optional = true }
@@ -33,7 +32,7 @@ regex = {version = "1.1", optional = true }
 substrate-serializer = { path = "../serializer" }
 pretty_assertions = "0.6"
 heapsize = "0.4"
-hex-literal = "0.1"
+hex-literal = "0.2"
 rand = "0.6"
 
 [features]
@@ -57,7 +56,6 @@ std = [
 	"blake2-rfc",
 	"ring",
 	"untrusted",
-	"hex-literal",
 	"hex",
 	"base58",
 	"substrate-bip39",

substrate/core/primitives/benches/benches.rs

@@ -16,10 +16,9 @@
 #![feature(test)]
 
 extern crate test;
-use hex_literal::{hex, hex_impl};
+use hex_literal::hex;
 use substrate_primitives::hashing::{twox_128, blake2_128};
 
-
 const MAX_KEY_SIZE: u32 = 32;
 
 fn data_set() -> Vec<Vec<u8>> {

substrate/core/primitives/src/crypto.rs

@@ -410,7 +410,7 @@ pub trait Pair: Sized {
 #[cfg(test)]
 mod tests {
 	use crate::DeriveJunction;
-	use hex_literal::{hex, hex_impl};
+	use hex_literal::hex;
 	use super::*;
 
 	#[derive(Eq, PartialEq, Debug)]

substrate/core/primitives/src/ed25519.rs

@@ -490,7 +490,7 @@ impl Pair {
 #[cfg(test)]
 mod test {
 	use super::*;
-	use hex_literal::{hex, hex_impl};
+	use hex_literal::hex;
 	use crate::crypto::DEV_PHRASE;
 
 	#[test]

substrate/core/primitives/src/sr25519.rs

@@ -504,7 +504,7 @@ impl Pair {
 mod test {
 	use super::*;
 	use crate::crypto::{Ss58Codec, DEV_PHRASE, DEV_ADDRESS};
-	use hex_literal::{hex, hex_impl};
+	use hex_literal::hex;
 
 	#[test]
 	fn default_phrase_should_be_used() {

substrate/core/rpc/Cargo.toml

@@ -32,4 +32,3 @@ test_client = { package = "substrate-test-client", path = "../test-client" }
 test_runtime = { package = "substrate-test-runtime", path = "../test-runtime" }
 consensus = { package = "substrate-consensus-common", path = "../consensus/common" }
 rustc-hex = "2.0"
-hex-literal = "0.1"

substrate/core/sr-primitives/src/lib.rs

@@ -33,9 +33,6 @@ use rstd::prelude::*;
 use substrate_primitives::{crypto, ed25519, sr25519, hash::{H256, H512}};
 use codec::{Encode, Decode};
 
-#[cfg(feature = "std")]
-use substrate_primitives::hexdisplay::ascii_format;
-
 #[cfg(feature = "std")]
 pub mod testing;
 

substrate/core/state-machine/Cargo.toml

@@ -6,7 +6,6 @@ description = "Substrate State Machine"
 edition = "2018"
 
 [dependencies]
-hex-literal = "0.1.0"
 log = "0.4"
 parking_lot = "0.7.1"
 heapsize = "0.4"
@@ -17,3 +16,6 @@ trie = { package = "substrate-trie", path = "../trie" }
 primitives = { package = "substrate-primitives", path = "../primitives" }
 panic-handler = { package = "substrate-panic-handler", path = "../panic-handler" }
 parity-codec = "3.3"
+
+[dev-dependencies]
+hex-literal = "0.2.0"

substrate/core/state-machine/src/basic.rs

@@ -166,7 +166,7 @@ impl<H: Hasher> Externalities<H> for BasicExternalities where H::Out: Ord + Heap
 mod tests {
 	use super::*;
 	use primitives::{Blake2Hasher, H256};
-	use hex_literal::{hex, hex_impl};
+	use hex_literal::hex;
 
 	#[test]
 	fn commit_should_work() {

substrate/core/state-machine/src/ext.rs

@@ -360,7 +360,7 @@ where
 
 #[cfg(test)]
 mod tests {
-	use hex_literal::{hex, hex_impl};
+	use hex_literal::hex;
 	use parity_codec::Encode;
 	use primitives::{Blake2Hasher};
 	use primitives::storage::well_known_keys::EXTRINSIC_INDEX;

substrate/core/state-machine/src/overlayed_changes.rs

@@ -309,7 +309,7 @@ impl From<Option<Vec<u8>>> for OverlayedValue {
 
 #[cfg(test)]
 mod tests {
-	use hex_literal::{hex, hex_impl};
+	use hex_literal::hex;
 	use primitives::{Blake2Hasher, H256};
 	use primitives::storage::well_known_keys::EXTRINSIC_INDEX;
 	use crate::backend::InMemory;

substrate/core/state-machine/src/testing.rs

@@ -180,7 +180,7 @@ impl<H: Hasher> Externalities<H> for TestExternalities<H> where H::Out: Ord + He
 mod tests {
 	use super::*;
 	use primitives::{Blake2Hasher, H256};
-	use hex_literal::{hex, hex_impl};
+	use hex_literal::hex;
 
 	#[test]
 	fn commit_should_work() {

substrate/core/test-runtime/Cargo.toml

@@ -6,7 +6,6 @@ edition = "2018"
 
 [dependencies]
 log = { version = "0.4", optional = true }
-hex-literal = { version = "0.1.0", optional = true }
 serde = { version = "1.0", optional = true, features = ["derive"] }
 parity-codec = { version = "3.3", default-features = false, features = ["derive"] }
 keyring = { package = "substrate-keyring", path = "../keyring", optional = true }
@@ -35,7 +34,6 @@ substrate-test-client = { path = "../test-client" }
 default = ["std"]
 std = [
 	"log",
-	"hex-literal",
 	"serde",
 	"substrate-client/std",
 	"keyring",

substrate/core/trie/Cargo.toml

@@ -25,7 +25,7 @@ trie-bench = { version = "0.12" }
 trie-standardmap = { version = "0.12" }
 keccak-hasher = { version = "0.12" }
 criterion = "0.2"
-hex-literal = "0.1.0"
+hex-literal = "0.2.0"
 
 [features]
 default = ["std"]

substrate/core/trie/src/lib.rs

@@ -339,7 +339,7 @@ mod tests {
 	use hash_db::{HashDB, Hasher};
 	use trie_db::{DBValue, TrieMut, Trie};
 	use trie_standardmap::{Alphabet, ValueMode, StandardMap};
-	use hex_literal::{hex, hex_impl};
+	use hex_literal::hex;
 
 	fn check_equivalent(input: &Vec<(&[u8], &[u8])>) {
 		{