Update rust-toolchain to nightly-2019-04-17

primitive-types/src/lib.rs

@@ -25,20 +25,30 @@ extern crate uint;
 #[macro_use]
 extern crate fixed_hash;
 
+use ustd::convert::TryFrom;
+
+#[cfg(feature = "serde")]
+pub use impl_serde::serde;
 #[cfg(feature = "serde")]
 use impl_serde::{impl_fixed_hash_serde, impl_uint_serde};
 
+#[cfg(feature = "codec")]
+pub use impl_codec::codec;
 #[cfg(feature = "codec")]
 use impl_codec::{impl_fixed_hash_codec, impl_fixed_hash_codec_ext, impl_uint_codec};
 
+#[cfg(feature = "rlp")]
+pub use impl_rlp::rlp;
 #[cfg(feature = "rlp")]
 use impl_rlp::{impl_fixed_hash_rlp, impl_uint_rlp};
 
-mod error;
-#[cfg(test)]
 mod tests;
 
-pub use self::error::{Error, Never, TryFrom, TryInto};
+/// Error type for conversion.
+pub enum Error {
+    /// Overflow encountered.
+    Overflow,
+}
 
 // ================================================================================================
 // Unsigned Integer -- U64, U128, U256, U512.

primitive-types/src/tests.rs

@@ -1,3 +1,5 @@
+#![cfg(test)]
+
 #[cfg(any(feature = "serde", feature = "codec"))]
 macro_rules! from_low_u64_be {
     ($hash: ident, $val: expr) => {{

rust-toolchain

@@ -1 +1 @@
-nightly-2019-03-05
+nightly-2019-04-17

ustd/src/lib.rs

@@ -21,7 +21,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg_attr(not(feature = "std"), feature(core_intrinsics))]
-#![cfg_attr(not(feature = "std"), feature(alloc))]
+#![cfg_attr(not(feature = "std"), feature(alloc_prelude))]
 
 use cfg_if::cfg_if;
 
@@ -32,7 +32,7 @@ cfg_if! {
         pub use alloc::boxed;
         pub use alloc::collections;
         pub use alloc::fmt as alloc_fmt;
-        pub use alloc::prelude as alloc_prelude;
+        pub use alloc::prelude::v1 as alloc_prelude;
         pub use alloc::rc;
         pub use alloc::string;
         pub use alloc::vec;