From 128e645a208affd063e3fe5d31e77d5a307b08d8 Mon Sep 17 00:00:00 2001
From: Brendan Zabarauskas <bjzaba@yahoo.com.au>
Date: Tue, 9 Jul 2013 17:05:19 +1000
Subject: [PATCH] Relax type bounds

---
 src/color/channel.rs | 2 +-
 src/color/hsv.rs     | 7 ++++---
 src/color/hsva.rs    | 9 +++++----
 src/color/rgb.rs     | 6 +++---
 src/color/rgba.rs    | 6 +++---
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/color/channel.rs b/src/color/channel.rs
index 227b1c9..a0822bd 100644
--- a/src/color/channel.rs
+++ b/src/color/channel.rs
@@ -14,7 +14,7 @@
 // limitations under the License.
 
 /// A color channel
-pub trait Channel: Num + ToChannel{
+pub trait Channel: Num + ToChannel {
     /// Convert a channel to the enclosing type
     ///
     /// # Example
diff --git a/src/color/hsv.rs b/src/color/hsv.rs
index 65b2fe0..677aaee 100644
--- a/src/color/hsv.rs
+++ b/src/color/hsv.rs
@@ -15,7 +15,8 @@
 
 use std::num;
 
-use color::{Channel, FloatChannel};
+use color::{Channel, ToChannel};
+use color::{FloatChannel, ToFloatChannel};
 use color::{RGB, ToRGB};
 
 #[path = "../num_macros.rs"]
@@ -34,7 +35,7 @@ pub trait ToHSV {
     pub fn to_hsv<U:Clone + FloatChannel>(&self) -> HSV<U>;
 }
 
-impl<T:Clone + FloatChannel> ToHSV for HSV<T> {
+impl<T:Clone + ToFloatChannel> ToHSV for HSV<T> {
     #[inline]
     pub fn to_hsv<U:Clone + FloatChannel>(&self) -> HSV<U> {
         HSV::new(FloatChannel::from((*self).h.clone()),
@@ -43,7 +44,7 @@ impl<T:Clone + FloatChannel> ToHSV for HSV<T> {
     }
 }
 
-impl<T:Clone + FloatChannel> ToRGB for HSV<T> {
+impl<T:Clone + Float + ToChannel> ToRGB for HSV<T> {
     pub fn to_rgb<U:Clone + Channel>(&self) -> RGB<U> {
         // Algorithm taken from the Wikipedia article on HSL and HSV:
         // http://en.wikipedia.org/wiki/HSL_and_HSV#From_HSV
diff --git a/src/color/hsva.rs b/src/color/hsva.rs
index 33902ee..17441f6 100644
--- a/src/color/hsva.rs
+++ b/src/color/hsva.rs
@@ -15,7 +15,8 @@
 
 use std::cast;
 
-use color::{Channel, FloatChannel};
+use color::{Channel, ToChannel};
+use color::{FloatChannel, ToFloatChannel};
 use color::{HSV, ToHSV, RGB, ToRGB, RGBA, ToRGBA};
 
 #[path = "../num_macros.rs"]
@@ -35,20 +36,20 @@ pub trait ToHSVA {
     pub fn to_hsva<U:Clone + FloatChannel>(&self) -> HSVA<U>;
 }
 
-impl<C: ToHSV, T:Clone + FloatChannel> ToHSVA for (C, T) {
+impl<C: ToHSV, T:Clone + ToFloatChannel> ToHSVA for (C, T) {
     #[inline]
     pub fn to_hsva<U:Clone + FloatChannel>(&self) -> HSVA<U> {
         match *self {
             (ref c, ref a) => unsafe {
                 cast::transmute::<(HSV<U>, U), HSVA<U>>(
-                    (c.to_hsv::<U>(), Channel::from(a.clone()))
+                    (c.to_hsv::<U>(), FloatChannel::from(a.clone()))
                 )
             }
         }
     }
 }
 
-impl<T:Clone + FloatChannel> ToRGBA for HSVA<T> {
+impl<T:Clone + Float + ToChannel> ToRGBA for HSVA<T> {
     #[inline]
     pub fn to_rgba<U:Clone + Channel>(&self) -> RGBA<U> {
         match unsafe {
diff --git a/src/color/rgb.rs b/src/color/rgb.rs
index 2c9c5e0..46a5337 100644
--- a/src/color/rgb.rs
+++ b/src/color/rgb.rs
@@ -15,7 +15,7 @@
 
 use std::num;
 
-use color::{Channel, FloatChannel};
+use color::{Channel, ToChannel, FloatChannel};
 use color::{HSV, ToHSV};
 
 #[path = "../num_macros.rs"]
@@ -35,7 +35,7 @@ pub trait ToRGB {
     pub fn to_rgb<U:Clone + Channel>(&self) -> RGB<U>;
 }
 
-impl<T:Clone + Channel> ToRGB for RGB<T> {
+impl<T:Clone + ToChannel> ToRGB for RGB<T> {
     #[inline]
     pub fn to_rgb<U:Clone + Channel>(&self) -> RGB<U> {
         RGB::new(Channel::from((*self).r.clone()),
@@ -44,7 +44,7 @@ impl<T:Clone + Channel> ToRGB for RGB<T> {
     }
 }
 
-impl<T:Clone + Channel> ToHSV for RGB<T> {
+impl<T:Clone + ToChannel> ToHSV for RGB<T> {
     #[inline]
     pub fn to_hsv<U:Clone + FloatChannel>(&self) -> HSV<U> {
         // Algorithm taken from the Wikipedia article on HSL and HSV:
diff --git a/src/color/rgba.rs b/src/color/rgba.rs
index 3938091..00ce1a0 100644
--- a/src/color/rgba.rs
+++ b/src/color/rgba.rs
@@ -15,7 +15,7 @@
 
 use std::cast;
 
-use color::{Channel, FloatChannel};
+use color::{Channel, ToChannel, FloatChannel};
 use color::{RGB, ToRGB, HSV, ToHSV, HSVA, ToHSVA};
 
 #[path = "../num_macros.rs"]
@@ -35,7 +35,7 @@ pub trait ToRGBA {
     pub fn to_rgba<U:Clone + Channel>(&self) -> RGBA<U>;
 }
 
-impl<C: ToRGB, T:Clone + Channel> ToRGBA for (C, T) {
+impl<C: ToRGB, T:Clone + ToChannel> ToRGBA for (C, T) {
     #[inline]
     pub fn to_rgba<U:Clone + Channel>(&self) -> RGBA<U> {
         match *self {
@@ -48,7 +48,7 @@ impl<C: ToRGB, T:Clone + Channel> ToRGBA for (C, T) {
     }
 }
 
-impl<T:Clone + FloatChannel> ToHSVA for RGBA<T> {
+impl<T:Clone + ToChannel> ToHSVA for RGBA<T> {
     #[inline]
     pub fn to_hsva<U:Clone + FloatChannel>(&self) -> HSVA<U> {
         match unsafe {