From e0cc1654f14a858f2b9eada38caaf36c14717ccc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Feb 2021 07:28:59 +0000 Subject: [PATCH 1/5] build(deps): update scale-info requirement from 0.5 to 0.6 Updates the requirements on [scale-info](https://github.com/paritytech/scale-info) to permit the latest version. - [Release notes](https://github.com/paritytech/scale-info/releases) - [Changelog](https://github.com/paritytech/scale-info/blob/master/CHANGELOG.md) - [Commits](https://github.com/paritytech/scale-info/commits/v0.6.0) Signed-off-by: dependabot[bot] --- primitive-types/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/primitive-types/Cargo.toml b/primitive-types/Cargo.toml index 9646b344f..8f668fd1b 100644 --- a/primitive-types/Cargo.toml +++ b/primitive-types/Cargo.toml @@ -14,7 +14,7 @@ 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 = { version = "0.6", features = ["derive"], default-features = false, optional = true } [features] default = ["std"] From 17abe727d53f08aa2bacfea55f8138eb3a9610df Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 16 Feb 2021 14:00:57 +0100 Subject: [PATCH 2/5] make it compile --- primitive-types/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/primitive-types/Cargo.toml b/primitive-types/Cargo.toml index 8f668fd1b..4ad0752aa 100644 --- a/primitive-types/Cargo.toml +++ b/primitive-types/Cargo.toml @@ -15,6 +15,7 @@ impl-codec = { version = "0.5.0", path = "impls/codec", default-features = false 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.6", features = ["derive"], default-features = false, optional = true } +parity-scale-codec = { version = "2.0", default-features = false, optional = true } [features] default = ["std"] @@ -23,7 +24,7 @@ byteorder = ["fixed-hash/byteorder"] rustc-hex = ["fixed-hash/rustc-hex"] serde = ["std", "impl-serde", "impl-serde/std"] serde_no_std = ["impl-serde"] -codec = ["impl-codec"] +codec = ["impl-codec", "parity-scale-codec"] rlp = ["impl-rlp"] arbitrary = ["fixed-hash/arbitrary", "uint/arbitrary"] fp-conversion = ["std"] From f3e4937cc04f098e6a702018034b6a3851a4ae19 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 16 Feb 2021 15:12:25 +0100 Subject: [PATCH 3/5] some comments never hurt --- primitive-types/Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/primitive-types/Cargo.toml b/primitive-types/Cargo.toml index 4ad0752aa..0946e2ec1 100644 --- a/primitive-types/Cargo.toml +++ b/primitive-types/Cargo.toml @@ -15,6 +15,8 @@ impl-codec = { version = "0.5.0", path = "impls/codec", default-features = false 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.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] From 486921581ccafe931d527998969f9d79b3f1d13f Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Wed, 17 Feb 2021 10:53:58 +0100 Subject: [PATCH 4/5] organize features properly, so that scale-info works with no_std --- .travis.yml | 1 + primitive-types/Cargo.toml | 5 +++-- primitive-types/src/lib.rs | 2 +- primitive-types/tests/scale_info.rs | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) 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 0946e2ec1..a3e6e9809 100644 --- a/primitive-types/Cargo.toml +++ b/primitive-types/Cargo.toml @@ -14,7 +14,7 @@ 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.6", features = ["derive"], default-features = false, optional = true } +codec-info = { 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 } @@ -26,7 +26,8 @@ byteorder = ["fixed-hash/byteorder"] rustc-hex = ["fixed-hash/rustc-hex"] serde = ["std", "impl-serde", "impl-serde/std"] serde_no_std = ["impl-serde"] -codec = ["impl-codec", "parity-scale-codec"] +codec = ["impl-codec"] +scale-info = ["codec", "codec-info", "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..e99d037a8 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 codec_info::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..76ee1780d 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 codec_info::{build::Fields, Path, Type, TypeInfo}; #[test] fn u256_scale_info() { From 3e440228a04ed8edb7d6ea3d05bad31850d5d432 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Wed, 17 Feb 2021 12:56:10 +0100 Subject: [PATCH 5/5] rename to scale-info-crate --- primitive-types/Cargo.toml | 4 ++-- primitive-types/src/lib.rs | 2 +- primitive-types/tests/scale_info.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/primitive-types/Cargo.toml b/primitive-types/Cargo.toml index a3e6e9809..426920aa1 100644 --- a/primitive-types/Cargo.toml +++ b/primitive-types/Cargo.toml @@ -14,7 +14,7 @@ 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 } -codec-info = { package = "scale-info", version = "0.6", 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 } @@ -27,7 +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", "codec-info", "parity-scale-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 e99d037a8..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 codec_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 76ee1780d..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 codec_info::{build::Fields, Path, Type, TypeInfo}; +use scale_info_crate::{build::Fields, Path, Type, TypeInfo}; #[test] fn u256_scale_info() {