From e39f02ccf773854efbf337732eb1f98e2959a0c6 Mon Sep 17 00:00:00 2001 From: Brendan Zabarauskas Date: Mon, 10 Dec 2012 10:40:32 +1000 Subject: [PATCH] Fix to_int conflict --- src/num/conv.rs | 32 ++++++++++++++++---------------- src/num/kinds.rs | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/num/conv.rs b/src/num/conv.rs index 58c79d5..2ebdc42 100644 --- a/src/num/conv.rs +++ b/src/num/conv.rs @@ -20,7 +20,7 @@ pub trait NumConv { pure fn to_i16(&self) -> i16; pure fn to_i32(&self) -> i32; pure fn to_i64(&self) -> i64; - pure fn to_int(&self) -> int; + pure fn to_int_(&self) -> int; // FIXME: conflict with `num::Num::to_int` :( pure fn to_f32(&self) -> f32; pure fn to_f64(&self) -> f64; @@ -43,7 +43,7 @@ pub impl u8: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -63,7 +63,7 @@ pub impl u16: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -83,7 +83,7 @@ pub impl u32: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -103,7 +103,7 @@ pub impl u64: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -123,7 +123,7 @@ pub impl uint: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -143,7 +143,7 @@ pub impl i8: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -163,7 +163,7 @@ pub impl i16: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -183,7 +183,7 @@ pub impl i32: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -203,7 +203,7 @@ pub impl i64: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -211,8 +211,8 @@ pub impl i64: NumConv { } pub impl int: NumConv { - #[inline(always)] static pure fn from(n: T) -> int { n.to_int() } - + #[inline(always)] static pure fn from(n: T) -> int { n.to_int_() } + #[inline(always)] pure fn to_u8(&self) -> u8 { *self as u8 } #[inline(always)] pure fn to_u16(&self) -> u16 { *self as u16 } #[inline(always)] pure fn to_u32(&self) -> u32 { *self as u32 } @@ -223,7 +223,7 @@ pub impl int: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self } + #[inline(always)] pure fn to_int_(&self) -> int { *self } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -243,7 +243,7 @@ pub impl f32: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } @@ -263,7 +263,7 @@ pub impl f64: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self } @@ -283,7 +283,7 @@ pub impl float: NumConv { #[inline(always)] pure fn to_i16(&self) -> i16 { *self as i16 } #[inline(always)] pure fn to_i32(&self) -> i32 { *self as i32 } #[inline(always)] pure fn to_i64(&self) -> i64 { *self as i64 } - #[inline(always)] pure fn to_int(&self) -> int { *self as int } + #[inline(always)] pure fn to_int_(&self) -> int { *self as int } #[inline(always)] pure fn to_f32(&self) -> f32 { *self as f32 } #[inline(always)] pure fn to_f64(&self) -> f64 { *self as f64 } diff --git a/src/num/kinds.rs b/src/num/kinds.rs index 67c632c..513ca0a 100644 --- a/src/num/kinds.rs +++ b/src/num/kinds.rs @@ -146,7 +146,7 @@ pub impl int: Number { /** * Construct an `int` from the type `T:Number` */ - #[inline(always)] static pure fn from(n: T) -> int { n.to_int() } + #[inline(always)] static pure fn from(n: T) -> int { n.to_int_() } #[inline(always)] static pure fn size_of() -> uint { sys::size_of::() } #[inline(always)] static pure fn bits() -> uint { sys::size_of::() * 8 }