Skip to content

build(deps): update scale-info requirement from 0.5 to 0.6 #519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ordian merged 6 commits into from
Feb 17, 2021
Merged

build(deps): update scale-info requirement from 0.5 to 0.6 #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0cc165
build(deps): update scale-info requirement from 0.5 to 0.6
dependabot[bot] Feb 8, 2021
17abe72
make it compile
ordian Feb 16, 2021
9d9c7b6
Merge branch 'master' into dependabot/cargo/scale-info-0.6
ordian Feb 16, 2021
f3e4937
some comments never hurt
ordian Feb 16, 2021
4869215
organize features properly, so that scale-info works with no_std
ordian Feb 17, 2021
3e44022
rename to scale-info-crate
ordian Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..
Expand Down
6 changes: 5 additions & 1 deletion primitive-types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion primitive-types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion primitive-types/tests/scale_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down