Skip to content

Add absolute path for 'Result' type usage in macros #160

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 1 commit into from
May 17, 2019
Merged

Add absolute path for 'Result' type usage in macros #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions uint/src/uint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ macro_rules! impl_try_from_for_primitive {
type Error = &'static str;

#[inline]
fn try_from(u: $from) -> Result<$to, &'static str> {
fn try_from(u: $from) -> $crate::core_::result::Result<$to, &'static str> {
let $from(arr) = u;
if !u.fits_word() || arr[0] > <$to>::max_value() as u64 {
Err(concat!("integer overflow when casting to ", stringify!($to)))
Expand Down Expand Up @@ -391,7 +391,7 @@ macro_rules! construct_uint {
type Error = &'static str;

#[inline]
fn try_from(u: $name) -> Result<u128, &'static str> {
fn try_from(u: $name) -> $crate::core_::result::Result<u128, &'static str> {
let $name(arr) = u;
for i in 2..$n_words {
if arr[i] != 0 {
Expand All @@ -406,7 +406,7 @@ macro_rules! construct_uint {
type Error = &'static str;

#[inline]
fn try_from(u: $name) -> Result<i128, &'static str> {
fn try_from(u: $name) -> $crate::core_::result::Result<i128, &'static str> {
let err_str = "integer overflow when casting to i128";
let i = u128::try_from(u).map_err(|_| err_str)?;
if i > i128::max_value() as u128 {
Expand Down Expand Up @@ -442,7 +442,7 @@ macro_rules! construct_uint {
pub const MAX: $name = $name([u64::max_value(); $n_words]);

/// Convert from a decimal string.
pub fn from_dec_str(value: &str) -> Result<Self, $crate::FromDecStrErr> {
pub fn from_dec_str(value: &str) -> $crate::core_::result::Result<Self, $crate::FromDecStrErr> {
if !value.bytes().all(|b| b >= 48 && b <= 57) {
return Err($crate::FromDecStrErr::InvalidCharacter)
}
Expand Down Expand Up @@ -1540,7 +1540,7 @@ macro_rules! impl_std_for_uint {
impl $crate::core_::str::FromStr for $name {
type Err = $crate::rustc_hex::FromHexError;

fn from_str(value: &str) -> Result<$name, Self::Err> {
fn from_str(value: &str) -> $crate::core_::result::Result<$name, Self::Err> {
use $crate::rustc_hex::FromHex;
let bytes: Vec<u8> = match value.len() % 2 == 0 {
true => value.from_hex()?,
Expand Down