From ce6ee7bb041044c3e236be7aefae97931e596407 Mon Sep 17 00:00:00 2001
From: Brendan Zabarauskas <bjzaba@yahoo.com.au>
Date: Sun, 14 Apr 2013 02:19:35 +1000
Subject: Restore Num trait

This restores the trait that was lost in 216e85fadf465c25fe7bc4a9f06f8162ec12b552. It will eventually be broken up into a more fine-grained trait hierarchy in the future once a design can be agreed upon.
---
 src/test/run-pass/trait-inheritance-num.rs  | 2 +-
 src/test/run-pass/trait-inheritance-num1.rs | 2 +-
 src/test/run-pass/trait-inheritance-num2.rs | 2 +-
 src/test/run-pass/trait-inheritance-num3.rs | 2 +-
 src/test/run-pass/trait-inheritance-num5.rs | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/test')

diff --git a/src/test/run-pass/trait-inheritance-num.rs b/src/test/run-pass/trait-inheritance-num.rs
index b800ffefeb6..0fb2a6b2e72 100644
--- a/src/test/run-pass/trait-inheritance-num.rs
+++ b/src/test/run-pass/trait-inheritance-num.rs
@@ -16,7 +16,7 @@ use core::cmp::{Eq, Ord};
 use core::num::NumCast::from;
 use std::cmp::FuzzyEq;
 
-pub trait NumExt: NumCast + Eq + Ord {}
+pub trait NumExt: Num + NumCast + Eq + Ord {}
 
 pub trait FloatExt: NumExt + FuzzyEq<Self> {}
 
diff --git a/src/test/run-pass/trait-inheritance-num1.rs b/src/test/run-pass/trait-inheritance-num1.rs
index 07b9772af29..d580b99012f 100644
--- a/src/test/run-pass/trait-inheritance-num1.rs
+++ b/src/test/run-pass/trait-inheritance-num1.rs
@@ -11,7 +11,7 @@
 use core::cmp::Ord;
 use core::num::NumCast::from;
 
-pub trait NumExt: NumCast + Ord { }
+pub trait NumExt: Num + NumCast + Ord { }
 
 fn greater_than_one<T:NumExt>(n: &T) -> bool {
     *n > from(1)
diff --git a/src/test/run-pass/trait-inheritance-num2.rs b/src/test/run-pass/trait-inheritance-num2.rs
index 66d7ee96bb2..b40f647814f 100644
--- a/src/test/run-pass/trait-inheritance-num2.rs
+++ b/src/test/run-pass/trait-inheritance-num2.rs
@@ -38,7 +38,7 @@ impl TypeExt for f64 {}
 impl TypeExt for float {}
 
 
-pub trait NumExt: TypeExt + Eq + Ord + NumCast {}
+pub trait NumExt: TypeExt + Eq + Ord + Num + NumCast {}
 
 impl NumExt for u8 {}
 impl NumExt for u16 {}
diff --git a/src/test/run-pass/trait-inheritance-num3.rs b/src/test/run-pass/trait-inheritance-num3.rs
index 67861709e76..5f1fef80ef2 100644
--- a/src/test/run-pass/trait-inheritance-num3.rs
+++ b/src/test/run-pass/trait-inheritance-num3.rs
@@ -11,7 +11,7 @@
 use core::cmp::{Eq, Ord};
 use core::num::NumCast::from;
 
-pub trait NumExt: Eq + Ord + NumCast {}
+pub trait NumExt: Eq + Ord + Num + NumCast {}
 
 impl NumExt for f32 {}
 
diff --git a/src/test/run-pass/trait-inheritance-num5.rs b/src/test/run-pass/trait-inheritance-num5.rs
index 2efe5b23eb5..02cc9a3d221 100644
--- a/src/test/run-pass/trait-inheritance-num5.rs
+++ b/src/test/run-pass/trait-inheritance-num5.rs
@@ -11,7 +11,7 @@
 use core::cmp::{Eq, Ord};
 use core::num::NumCast::from;
 
-pub trait NumExt: Eq + NumCast {}
+pub trait NumExt: Eq + Num + NumCast {}
 
 impl NumExt for f32 {}
 impl NumExt for int {}
-- 
cgit 1.4.1-3-g733a5