Skip to content

Use newly stablized TryFrom trait for primitive-types #127

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 2 commits into from
Apr 24, 2019
Merged

Use newly stablized TryFrom trait for primitive-types #127

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c7dc24
Use newly stablized TryFrom trait
sorpaas Apr 24, 2019
eb95743
Remove ! before cfg
sorpaas Apr 24, 2019
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
67 changes: 0 additions & 67 deletions primitive-types/src/error.rs
View file
Open in desktop

This file was deleted.

13 changes: 10 additions & 3 deletions primitive-types/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@

#![cfg_attr(not(feature = "std"), no_std)]

mod error;

pub use error::{Error, TryFrom, TryInto, Never};
#![cfg(feature = "std")]

@niklasad1 niklasad1 Apr 24, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this really correct?
why enforce feature = std in the crate?

I guess it should be #[cfg(feature = "std")]?

@sorpaas sorpaas Apr 24, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested in edition 2015 #[cfg(feature = "std")] is still necessary, otherwise compiler would complain core being reimported when building no_std.

extern crate core;

#[macro_use]
extern crate uint;
Expand All @@ -36,6 +35,14 @@ extern crate impl_codec;
#[macro_use]
extern crate impl_rlp;

use core::convert::TryFrom;

/// Error type for conversion.
pub enum Error {
/// Overflow encountered.
Overflow,
}

construct_uint! {
/// 128-bit unsigned integer.
pub struct U128(2);
Expand Down