Merge pull request #4676 from thestinger/fuzzy

catamorphism · catamorphism · commit a80a65b3b7af · 2013-01-29T13:58:39.000-08:00
fix FuzzyEq
diff --git a/src/libstd/cmp.rs b/src/libstd/cmp.rs
@@ -24,7 +24,7 @@ pub trait FuzzyEq {
 
 impl float: FuzzyEq {
     pure fn fuzzy_eq(&self, other: &float) -> bool {
-        self.fuzzy_eq_eps(other, fuzzy_epsilon)
+        self.fuzzy_eq_eps(other, &fuzzy_epsilon)
     }
 
     pure fn fuzzy_eq_eps(&self, other: &float, epsilon: &float) -> bool {
@@ -34,7 +34,7 @@ impl float: FuzzyEq {
 
 impl f32: FuzzyEq {
     pure fn fuzzy_eq(&self, other: &f32) -> bool {
-        self.fuzzy_eq_eps(other, fuzzy_epsilon as f32)
+        self.fuzzy_eq_eps(other, &(fuzzy_epsilon as f32))
     }
 
     pure fn fuzzy_eq_eps(&self, other: &f32, epsilon: &f32) -> bool {
@@ -44,7 +44,7 @@ impl f32: FuzzyEq {
 
 impl f64: FuzzyEq {
     pure fn fuzzy_eq(&self, other: &f64) -> bool {
-        self.fuzzy_eq_eps(other, fuzzy_epsilon as f64)
+        self.fuzzy_eq_eps(other, &(fuzzy_epsilon as f64))
     }
 
     pure fn fuzzy_eq_eps(&self, other: &f64, epsilon: &f64) -> bool {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ pub trait FuzzyEq {`
`24`	`24`
`25`	`25`	`impl float: FuzzyEq {`
`26`	`26`	`pure fn fuzzy_eq(&self, other: &float) -> bool {`
`27`		`- self.fuzzy_eq_eps(other, fuzzy_epsilon)`
	`27`	`+ self.fuzzy_eq_eps(other, &fuzzy_epsilon)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`pure fn fuzzy_eq_eps(&self, other: &float, epsilon: &float) -> bool {`
`@@ -34,7 +34,7 @@ impl float: FuzzyEq {`
`34`	`34`
`35`	`35`	`impl f32: FuzzyEq {`
`36`	`36`	`pure fn fuzzy_eq(&self, other: &f32) -> bool {`
`37`		`- self.fuzzy_eq_eps(other, fuzzy_epsilon as f32)`
	`37`	`+ self.fuzzy_eq_eps(other, &(fuzzy_epsilon as f32))`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`pure fn fuzzy_eq_eps(&self, other: &f32, epsilon: &f32) -> bool {`
`@@ -44,7 +44,7 @@ impl f32: FuzzyEq {`
`44`	`44`
`45`	`45`	`impl f64: FuzzyEq {`
`46`	`46`	`pure fn fuzzy_eq(&self, other: &f64) -> bool {`
`47`		`- self.fuzzy_eq_eps(other, fuzzy_epsilon as f64)`
	`47`	`+ self.fuzzy_eq_eps(other, &(fuzzy_epsilon as f64))`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`pure fn fuzzy_eq_eps(&self, other: &f64, epsilon: &f64) -> bool {`