Update bitvec to 1.0 version (#137)

Cupnfish · web-flow · commit 6b5d260146fc · 2022-02-07T09:49:11.000Z
* Update bitvec to 1.0 version

* Update bit-vec 1.0

* Better Order
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["no-std", "encoding"]
 include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 
 [dependencies]
-bitvec = { version = "0.20.1", default-features = false, features = ["alloc"], optional = true }
+bitvec = { version = "1", default-features = false, features = ["alloc"], optional = true }
 cfg-if = "1.0"
 scale-info-derive = { version = "1.0.0", path = "derive", default-features = false, optional = true }
 serde = { version = "1", default-features = false, optional = true, features = ["derive", "alloc"] }
diff --git a/src/impls.rs b/src/impls.rs
@@ -390,15 +390,15 @@ where
 mod bit_vec {
     use super::*;
 
-    impl<O, T> TypeInfo for bitvec::vec::BitVec<O, T>
+    impl<T, O> TypeInfo for bitvec::vec::BitVec<T, O>
     where
-        O: bitvec::order::BitOrder + TypeInfo + 'static,
         T: bitvec::store::BitStore + TypeInfo + 'static,
+        O: bitvec::order::BitOrder + TypeInfo + 'static,
     {
         type Identity = Self;
 
         fn type_info() -> Type {
-            crate::TypeDefBitSequence::new::<O, T>().into()
+            crate::TypeDefBitSequence::new::<T, O>().into()
         }
     }
 
diff --git a/src/tests.rs b/src/tests.rs
@@ -152,18 +152,18 @@ fn bitvec() {
     };
 
     assert_type!(
-        BitVec<Lsb0, u8>,
-        TypeDefBitSequence::new::<Lsb0, u8>()
+        BitVec<u8,Lsb0>,
+        TypeDefBitSequence::new::<u8,Lsb0>()
     );
 
     assert_type!(
-        BitVec<Msb0, u16>,
-        TypeDefBitSequence::new::<Msb0, u16>()
+        BitVec<u16,Msb0>,
+        TypeDefBitSequence::new::<u16,Msb0>()
     );
 
     assert_type!(
-        BitVec<Msb0, u32>,
-        TypeDefBitSequence::new::<Msb0, u32>()
+        BitVec<u32,Msb0>,
+        TypeDefBitSequence::new::<u32,Msb0>()
     );
 }
 
diff --git a/src/ty/mod.rs b/src/ty/mod.rs
@@ -544,19 +544,19 @@ where
 #[cfg_attr(any(feature = "std", feature = "decode"), derive(scale::Decode))]
 #[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Debug)]
 pub struct TypeDefBitSequence<T: Form = MetaForm> {
-    /// The type implementing [`bitvec::store::BitStore`].
-    bit_store_type: T::Type,
     /// The type implementing [`bitvec::order::BitOrder`].
     bit_order_type: T::Type,
+    /// The type implementing [`bitvec::store::BitStore`].
+    bit_store_type: T::Type,
 }
 
 impl IntoPortable for TypeDefBitSequence {
     type Output = TypeDefBitSequence<PortableForm>;
 
     fn into_portable(self, registry: &mut Registry) -> Self::Output {
         TypeDefBitSequence {
-            bit_store_type: registry.register_type(&self.bit_store_type),
             bit_order_type: registry.register_type(&self.bit_order_type),
+            bit_store_type: registry.register_type(&self.bit_store_type),
         }
     }
 }
@@ -579,14 +579,14 @@ where
 #[cfg(feature = "bit-vec")]
 impl TypeDefBitSequence {
     /// Creates a new [`TypeDefBitSequence`] for the supplied bit order and bit store types.
-    pub fn new<O, T>() -> Self
+    pub fn new<T, O>() -> Self
     where
-        O: bitvec::order::BitOrder + TypeInfo + 'static,
         T: bitvec::store::BitStore + TypeInfo + 'static,
+        O: bitvec::order::BitOrder + TypeInfo + 'static,
     {
         Self {
-            bit_order_type: MetaType::new::<O>(),
             bit_store_type: MetaType::new::<T>(),
+            bit_order_type: MetaType::new::<O>(),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -390,15 +390,15 @@ where`
`390`	`390`	`mod bit_vec {`
`391`	`391`	`use super::*;`
`392`	`392`
`393`		`- impl<O, T> TypeInfo for bitvec::vec::BitVec<O, T>`
	`393`	`+ impl<T, O> TypeInfo for bitvec::vec::BitVec<T, O>`
`394`	`394`	`where`
`395`		`- O: bitvec::order::BitOrder + TypeInfo + 'static,`
`396`	`395`	`T: bitvec::store::BitStore + TypeInfo + 'static,`
	`396`	`+ O: bitvec::order::BitOrder + TypeInfo + 'static,`
`397`	`397`	`{`
`398`	`398`	`type Identity = Self;`
`399`	`399`
`400`	`400`	`fn type_info() -> Type {`
`401`		`- crate::TypeDefBitSequence::new::<O, T>().into()`
	`401`	`+ crate::TypeDefBitSequence::new::<T, O>().into()`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`
Original file line number	Diff line number	Diff line change
`@@ -544,19 +544,19 @@ where`
`544`	`544`	`#[cfg_attr(any(feature = "std", feature = "decode"), derive(scale::Decode))]`
`545`	`545`	`#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Encode, Debug)]`
`546`	`546`	`pub struct TypeDefBitSequence<T: Form = MetaForm> {`
`547`		- /// The type implementing [`bitvec::store::BitStore`].
`548`		`- bit_store_type: T::Type,`
`549`	`547`	/// The type implementing [`bitvec::order::BitOrder`].
`550`	`548`	`bit_order_type: T::Type,`
	`549`	+ /// The type implementing [`bitvec::store::BitStore`].
	`550`	`+ bit_store_type: T::Type,`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`impl IntoPortable for TypeDefBitSequence {`
`554`	`554`	`type Output = TypeDefBitSequence<PortableForm>;`
`555`	`555`
`556`	`556`	`fn into_portable(self, registry: &mut Registry) -> Self::Output {`
`557`	`557`	`TypeDefBitSequence {`
`558`		`- bit_store_type: registry.register_type(&self.bit_store_type),`
`559`	`558`	`bit_order_type: registry.register_type(&self.bit_order_type),`
	`559`	`+ bit_store_type: registry.register_type(&self.bit_store_type),`
`560`	`560`	`}`
`561`	`561`	`}`
`562`	`562`	`}`
`@@ -579,14 +579,14 @@ where`
`579`	`579`	`#[cfg(feature = "bit-vec")]`
`580`	`580`	`impl TypeDefBitSequence {`
`581`	`581`	/// Creates a new [`TypeDefBitSequence`] for the supplied bit order and bit store types.
`582`		`- pub fn new<O, T>() -> Self`
	`582`	`+ pub fn new<T, O>() -> Self`
`583`	`583`	`where`
`584`		`- O: bitvec::order::BitOrder + TypeInfo + 'static,`
`585`	`584`	`T: bitvec::store::BitStore + TypeInfo + 'static,`
	`585`	`+ O: bitvec::order::BitOrder + TypeInfo + 'static,`
`586`	`586`	`{`
`587`	`587`	`Self {`
`588`		`- bit_order_type: MetaType::new::<O>(),`
`589`	`588`	`bit_store_type: MetaType::new::<T>(),`
	`589`	`+ bit_order_type: MetaType::new::<O>(),`
`590`	`590`	`}`
`591`	`591`	`}`
`592`	`592`	`}`