primitive-types: address nits of #480 (#485)

* primitive-types: address nits of #480 * fix ethereum-types
paritytech · Jan 1, 2021 · 36004c9 · 36004c9
1 parent b52051d
commit 36004c9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/ethereum-types/src/lib.rs b/ethereum-types/src/lib.rs
@@ -13,9 +13,7 @@ mod uint;
 
 pub use ethbloom::{Bloom, BloomRef, Input as BloomInput};
 pub use hash::{BigEndianHash, H128, H160, H256, H264, H32, H512, H520, H64};
-#[cfg(feature = "num-traits")]
-pub use primitive_types::{FromStrRadixErr, FromStrRadixErrKind};
-pub use uint::{FromDecStrErr, U128, U256, U512, U64};
+pub use uint::{FromDecStrErr, FromStrRadixErr, FromStrRadixErrKind, U128, U256, U512, U64};
 
 pub type Address = H160;
 pub type Secret = H256;

diff --git a/ethereum-types/src/uint.rs b/ethereum-types/src/uint.rs
@@ -14,7 +14,7 @@ use impl_rlp::impl_uint_rlp;
 use impl_serde::impl_uint_serde;
 use uint_crate::*;
 
-pub use uint_crate::FromDecStrErr;
+pub use uint_crate::{FromDecStrErr, FromStrRadixErr, FromStrRadixErrKind};
 
 construct_uint! {
 	/// Unsigned 64-bit integer.

diff --git a/primitive-types/impls/num-traits/Cargo.toml b/primitive-types/impls/num-traits/Cargo.toml
@@ -10,7 +10,3 @@ edition = "2018"
 [dependencies]
 num-traits = { version = "0.2", default-features = false }
 uint = { version = "0.8.5", path = "../../../uint", default-features = false }
-
-[features]
-default = ["std"]
-std = ["num-traits/std", "uint/std"]
diff --git a/primitive-types/impls/num-traits/src/lib.rs b/primitive-types/impls/num-traits/src/lib.rs
@@ -8,12 +8,13 @@
 
 //! num-traits support for uint.
 
-#![cfg_attr(not(feature = "std"), no_std)]
+#![no_std]
 
 #[doc(hidden)]
 pub use num_traits;
 
-pub use uint::{FromStrRadixErr, FromStrRadixErrKind};
+#[doc(hidden)]
+pub use uint;
 
 /// Add num-traits support to an integer created by `construct_uint!`.
 #[macro_export]
@@ -39,7 +40,7 @@ macro_rules! impl_uint_num_traits {
 		}
 
 		impl $crate::num_traits::Num for $name {
-			type FromStrRadixErr = $crate::FromStrRadixErr;
+			type FromStrRadixErr = $crate::uint::FromStrRadixErr;
 
 			fn from_str_radix(txt: &str, radix: u32) -> Result<Self, Self::FromStrRadixErr> {
 				Self::from_str_radix(txt, radix)

diff --git a/primitive-types/src/lib.rs b/primitive-types/src/lib.rs
@@ -22,7 +22,6 @@ use fixed_hash::{construct_fixed_hash, impl_fixed_hash_conversions};
 #[cfg(feature = "scale-info")]
 use scale_info::TypeInfo;
 use uint::{construct_uint, uint_full_mul_reg};
-pub use uint::{FromStrRadixErr, FromStrRadixErrKind};
 
 /// Error type for conversion.
 #[derive(Debug, PartialEq, Eq)]