diff --git a/.travis.yml b/.travis.yml index 08e4240cf..86b226190 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,6 +60,7 @@ script: - cd parity-util-mem/ && cargo test --no-default-features --features=dlmalloc-global && cd .. - cd primitive-types/ && cargo test --all-features && cd .. - cd primitive-types/ && cargo test --no-default-features --features=serde_no_std && cd .. + - cd primitive-types/ && cargo test --no-default-features --features=scale-info && cd .. - cd rlp/ && cargo test --no-default-features && cargo check --benches && cd .. - cd triehash/ && cargo check --benches && cd .. - cd kvdb-web/ && wasm-pack test --headless --firefox && cd .. diff --git a/primitive-types/Cargo.toml b/primitive-types/Cargo.toml index 9646b344f..426920aa1 100644 --- a/primitive-types/Cargo.toml +++ b/primitive-types/Cargo.toml @@ -14,7 +14,10 @@ impl-serde = { version = "0.3.1", path = "impls/serde", default-features = false impl-codec = { version = "0.5.0", path = "impls/codec", default-features = false, optional = true } impl-num-traits = { version = "0.1.0", path = "impls/num-traits", default-features = false, optional = true } impl-rlp = { version = "0.3", path = "impls/rlp", default-features = false, optional = true } -scale-info = { version = "0.5", features = ["derive"], default-features = false, optional = true } +scale-info-crate = { package = "scale-info", version = "0.6", features = ["derive"], default-features = false, optional = true } +# we add parity-scale-codec here directly only because scale-info requires us to do so +# see https://github.com/paritytech/scale-info/pull/61#discussion_r568760753 +parity-scale-codec = { version = "2.0", default-features = false, optional = true } [features] default = ["std"] @@ -24,6 +27,7 @@ rustc-hex = ["fixed-hash/rustc-hex"] serde = ["std", "impl-serde", "impl-serde/std"] serde_no_std = ["impl-serde"] codec = ["impl-codec"] +scale-info = ["codec", "scale-info-crate", "parity-scale-codec"] rlp = ["impl-rlp"] arbitrary = ["fixed-hash/arbitrary", "uint/arbitrary"] fp-conversion = ["std"] diff --git a/primitive-types/src/lib.rs b/primitive-types/src/lib.rs index 696ac6898..ab3248f60 100644 --- a/primitive-types/src/lib.rs +++ b/primitive-types/src/lib.rs @@ -20,7 +20,7 @@ mod fp_conversion; use core::convert::TryFrom; use fixed_hash::{construct_fixed_hash, impl_fixed_hash_conversions}; #[cfg(feature = "scale-info")] -use scale_info::TypeInfo; +use scale_info_crate::TypeInfo; use uint::{construct_uint, uint_full_mul_reg}; /// Error type for conversion. diff --git a/primitive-types/tests/scale_info.rs b/primitive-types/tests/scale_info.rs index 1acecf54e..3774c8448 100644 --- a/primitive-types/tests/scale_info.rs +++ b/primitive-types/tests/scale_info.rs @@ -9,7 +9,7 @@ //! Tests for scale-info feature of primitive-types. use primitive_types::{H256, U256}; -use scale_info::{build::Fields, Path, Type, TypeInfo}; +use scale_info_crate::{build::Fields, Path, Type, TypeInfo}; #[test] fn u256_scale_info() {