move hascid to cid-ext crate

Cargo.toml

@@ -2,6 +2,7 @@
 members = [
     "core/amt-ipld",
     "core/block-format",
+    "core/cid-ext",
     "core/datastore",
     "core/ds/rocksdb",
     "core/fs-lock",

core/cid-ext/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "cid-ext"
+version = "0.1.0"
+authors = ["PolkaX <https://github.com/PolkaX>"]
+edition = "2018"
+
+[dependencies]
+cid = { version = "0.4", features = ["impl-serde"] }
+
+[features]
+nightly = []

core/cid-ext/src/lib.rs

@@ -0,0 +1,22 @@
+#![cfg_attr(feature = "nightly", feature(specialization))]
+
+use cid::Cid;
+
+/// A trait that represents whether a CID exists.
+pub trait HasCid {
+    /// Whether a CID exists.
+    fn has_cid(&self) -> Option<&Cid>;
+}
+
+#[cfg(feature = "nightly")]
+impl<T> HasCid for T {
+    default fn has_cid(&self) -> Option<&Cid> {
+        None
+    }
+}
+
+impl<T: AsRef<Cid>> HasCid for T {
+    fn has_cid(&self) -> Option<&Cid> {
+        Some(self.as_ref())
+    }
+}

core/hamt-ipld/Cargo.toml

@@ -22,6 +22,7 @@ thiserror = "1.0"
 
 block-format = { package = "rust-block-format", path = "../block-format" }
 ipld-cbor = { package = "rust-ipld-cbor", path = "../ipld/cbor", features = ["bigint"] }
+cid-ext = { path = "../cid-ext" }
 
 [dev-dependencies]
 matches = "0.1"
@@ -30,3 +31,4 @@ serde_json = "1.0"
 
 [features]
 test-hash = []
+nightly = [ "cid-ext/nightly" ]

core/hamt-ipld/src/ipld.rs

@@ -2,6 +2,7 @@
 
 use block_format::Block as BlockT;
 use cid::{Cid, Codec};
+use cid_ext::HasCid;
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::error::*;
@@ -16,24 +17,6 @@ pub trait CborIpldStore {
     fn put<T: Serialize + HasCid>(&mut self, v: T) -> Result<Cid>;
 }
 
-/// A trait that represents whether a CID exists.
-pub trait HasCid {
-    /// Whether a CID exists.
-    fn has_cid(&self) -> Option<&Cid>;
-}
-
-impl<T> HasCid for T {
-    default fn has_cid(&self) -> Option<&Cid> {
-        None
-    }
-}
-
-impl<T: AsRef<Cid>> HasCid for T {
-    fn has_cid(&self) -> Option<&Cid> {
-        Some(self.as_ref())
-    }
-}
-
 #[derive(Debug)]
 #[cfg_attr(test, derive(Clone))]
 pub struct BasicCborIpldStore<B: Blockstore> {

core/hamt-ipld/src/lib.rs

@@ -3,7 +3,6 @@
 //! A implementation of `ipld hamt` in Rust.
 
 #![allow(clippy::bool_comparison, clippy::type_complexity, clippy::or_fun_call)]
-#![feature(specialization)]
 
 mod error;
 mod hash;
@@ -12,5 +11,5 @@ pub mod node;
 #[cfg(test)]
 mod tests;
 
-pub use self::ipld::{cst_from_bstore, BasicCborIpldStore, Blockstore, CborIpldStore, HasCid};
+pub use self::ipld::{cst_from_bstore, BasicCborIpldStore, Blockstore, CborIpldStore};
 pub use self::node::{Hamt, DEFAULT_BIT_WIDTH};

core/hamt-ipld/src/node/mod.rs

@@ -57,6 +57,13 @@ pub struct Node {
     items: RefCell<Vec<Item>>,
 }
 
+#[cfg(not(feature = "nightly"))]
+impl<'a> cid_ext::HasCid for &'a Node {
+    fn has_cid(&self) -> Option<&Cid> {
+        None
+    }
+}
+
 #[inline]
 pub fn set_bit(input: &mut U256, n: u32) {
     let one: U256 = 1.into();
@@ -394,7 +401,7 @@ impl Node {
         for item in &mut items[..].iter_mut() {
             if let Item::Ptr(node) = item {
                 node.flush(bs)?;
-                let cid = bs.put(&node)?;
+                let cid = bs.put(&**node)?;
                 // flush current item
                 *item = Item::Link(cid);
             }
@@ -407,7 +414,7 @@ impl Node {
     where
         B: CborIpldStore,
     {
-        let cid = bs.put(&self)?;
+        let cid = bs.put(&*self)?;
         let node: Node = bs.get(&cid)?;
         let mut total_size = ipld_cbor::dump_object(&node)?.len() as u64;
         for item in self.items.borrow_mut().iter_mut() {

rust-toolchain

@@ -1 +0,0 @@
-nightly-2019-12-20