Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Update rust-toolchain to nightly-2019-04-17 (#6)
Browse files Browse the repository at this point in the history
Signed-off-by: koushiro <[email protected]>
  • Loading branch information
koushiro authored Apr 17, 2019
1 parent 98e7397 commit a526228
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 78 deletions.
72 changes: 0 additions & 72 deletions primitive-types/src/error.rs

This file was deleted.

16 changes: 13 additions & 3 deletions primitive-types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions primitive-types/src/tests.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![cfg(test)]

#[cfg(any(feature = "serde", feature = "codec"))]
macro_rules! from_low_u64_be {
($hash: ident, $val: expr) => {{
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2019-03-05
nightly-2019-04-17
4 changes: 2 additions & 2 deletions ustd/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down

0 comments on commit a526228

Please sign in to comment.