Use the published never-type library

CodeChain-io · Apr 7, 2019 · ed37435 · ed37435
1 parent eaf84be
commit ed37435
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,7 +39,7 @@ kvdb = { path = "util/kvdb" }
 kvdb-rocksdb = { path = "util/kvdb-rocksdb" }
 log = "0.4.6"
 env_logger = "0.5.3"
-never = { git = "https://github.com/CodeChain-io/rust-never.git" }
+never-type = "0.1.0"
 panic_hook = { path = "util/panic_hook" }
 parking_lot = "0.6.0"
 primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" }

diff --git a/codechain/config/chain_type.rs b/codechain/config/chain_type.rs
@@ -18,7 +18,7 @@ use std::str::FromStr;
 use std::{fmt, fs};
 
 use ccore::Scheme;
-use never::Never;
+use never_type::Never;
 
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 #[serde(rename_all = "snake_case")]

diff --git a/codechain/main.rs b/codechain/main.rs
@@ -48,7 +48,7 @@ extern crate fdlimit;
 extern crate finally_block;
 extern crate kvdb;
 extern crate kvdb_rocksdb;
-extern crate never;
+extern crate never_type;
 extern crate panic_hook;
 extern crate parking_lot;
 extern crate primitives;

diff --git a/discovery/Cargo.toml b/discovery/Cargo.toml
@@ -10,7 +10,7 @@ codechain-logger = { path = "../util/logger" }
 codechain-network = { path = "../network" }
 codechain-timer = { path = "../util/timer" }
 log = "0.4.6"
-never = { git = "https://github.com/CodeChain-io/rust-never.git" }
+never-type = "0.1.0"
 parking_lot = "0.6.0"
 primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" }
 rand = "0.6.1"

diff --git a/discovery/src/extension.rs b/discovery/src/extension.rs
@@ -19,7 +19,7 @@ use std::sync::Arc;
 
 use cnetwork::{Api, IntoSocketAddr, NetworkExtension, NodeId, RoutingTable};
 use ctimer::TimerToken;
-use never::Never;
+use never_type::Never;
 use rand::prelude::SliceRandom;
 use rand::thread_rng;
 use rlp::{Decodable, Encodable, UntrustedRlp};

diff --git a/discovery/src/lib.rs b/discovery/src/lib.rs
@@ -18,7 +18,7 @@
 
 #[macro_use]
 extern crate log;
-extern crate never;
+extern crate never_type;
 extern crate parking_lot;
 extern crate primitives;
 extern crate rand;

diff --git a/key/Cargo.toml b/key/Cargo.toml
@@ -10,7 +10,7 @@ rustc-serialize = "0.3"
 lazy_static = "1.2"
 bech32 = "0.2.2"
 codechain-crypto = { path = "../crypto" }
-never = { git = "https://github.com/CodeChain-io/rust-never.git" }
+never-type = "0.1.0"
 parking_lot = "0.6.0"
 primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" }
 rand_xorshift = "0.1.0"

diff --git a/key/src/lib.rs b/key/src/lib.rs
@@ -18,7 +18,7 @@ extern crate codechain_crypto as crypto;
 #[macro_use]
 extern crate lazy_static;
 extern crate bech32;
-extern crate never;
+extern crate never_type;
 extern crate parking_lot;
 extern crate primitives;
 extern crate rand;

diff --git a/key/src/password.rs b/key/src/password.rs
@@ -18,7 +18,7 @@ use std::str::FromStr;
 use std::{fmt, ptr};
 
 use crypto::Password as CryptoPassword;
-use never::Never;
+use never_type::Never;
 
 #[derive(Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Password(String);

diff --git a/key/src/random.rs b/key/src/random.rs
@@ -19,7 +19,7 @@ use std::cell::RefCell;
 #[cfg(test)]
 use std::{mem, thread};
 
-use never::Never;
+use never_type::Never;
 use rand::rngs::OsRng;
 #[cfg(test)]
 use rand::SeedableRng;

diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -15,7 +15,7 @@ finally-block = "0.1"
 primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" }
 log = "0.4.6"
 mio = "0.6.16"
-never = { git = "https://github.com/CodeChain-io/rust-never.git" }
+never-type = "0.1.0"
 parking_lot = "0.6.0"
 rand = "0.6.1"
 rlp = { path = "../util/rlp" }

diff --git a/network/src/client.rs b/network/src/client.rs
@@ -279,7 +279,7 @@ enum ExtensionMessage {
 #[cfg(test)]
 mod tests {
     use cio::IoService;
-    use never::Never;
+    use never_type::Never;
 
     use super::*;
     use crate::SocketAddr;

diff --git a/network/src/lib.rs b/network/src/lib.rs
@@ -36,7 +36,7 @@ extern crate rand;
 extern crate rlp;
 #[macro_use]
 extern crate rlp_derive;
-extern crate never;
+extern crate never_type;
 extern crate table as ctable;
 extern crate time;
 extern crate token_generator;

diff --git a/sync/Cargo.toml b/sync/Cargo.toml
@@ -17,7 +17,7 @@ codechain-types = { path = "../types" }
 journaldb = { path = "../util/journaldb" }
 kvdb = { path = "../util/kvdb" }
 log = "0.4.6"
-never = { git = "https://github.com/CodeChain-io/rust-never.git" }
+never-type = "0.1.0"
 parking_lot = "0.6.0"
 primitives = { git = "https://github.com/CodeChain-io/rust-codechain-primitives.git", version = "0.4" }
 rand = "0.6.1"

diff --git a/sync/src/lib.rs b/sync/src/lib.rs
@@ -33,7 +33,7 @@ extern crate kvdb;
 extern crate kvdb_memorydb;
 #[macro_use]
 extern crate log;
-extern crate never;
+extern crate never_type;
 extern crate primitives;
 extern crate rand;
 extern crate rlp;

diff --git a/sync/src/transaction/extension.rs b/sync/src/transaction/extension.rs
@@ -20,7 +20,7 @@ use std::sync::Arc;
 use ccore::BlockChainClient;
 use cnetwork::{Api, NetworkExtension, NodeId};
 use ctimer::TimerToken;
-use never::Never;
+use never_type::Never;
 use primitives::H256;
 use rlp::{Encodable, UntrustedRlp};
 use time::Duration;