Skip to content

Commit b9e3cb4

Browse files
committed
---
yaml --- r: 30224 b: refs/heads/incoming c: 2580040 h: refs/heads/master v: v3
1 parent c275ee4 commit b9e3cb4

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 340a21929024efedec5dfa8d4c6a14df41640f78
9+
refs/heads/incoming: 2580040995ec0db96aa180170195c1ae318fc9ed
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/cmp.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
11
#[deny(non_camel_case_types)];
2+
#[forbid(deprecated_mode)];
3+
#[forbid(deprecated_pattern)];
24
/// Additional general-purpose comparison functionality.
35
46
const fuzzy_epsilon: float = 1.0e-6;
57

68
trait FuzzyEq {
7-
pure fn fuzzy_eq(&&other: self) -> bool;
9+
pure fn fuzzy_eq(other: &self) -> bool;
810
}
911

1012
impl float: FuzzyEq {
11-
pure fn fuzzy_eq(&&other: float) -> bool {
12-
return float::abs(self - other) < fuzzy_epsilon;
13+
pure fn fuzzy_eq(other: &float) -> bool {
14+
return float::abs(self - *other) < fuzzy_epsilon;
1315
}
1416
}
1517

1618
impl f32: FuzzyEq {
17-
pure fn fuzzy_eq(&&other: f32) -> bool {
18-
return f32::abs(self - other) < (fuzzy_epsilon as f32);
19+
pure fn fuzzy_eq(other: &f32) -> bool {
20+
return f32::abs(self - *other) < (fuzzy_epsilon as f32);
1921
}
2022
}
2123

2224
impl f64: FuzzyEq {
23-
pure fn fuzzy_eq(&&other: f64) -> bool {
24-
return f64::abs(self - other) < (fuzzy_epsilon as f64);
25+
pure fn fuzzy_eq(other: &f64) -> bool {
26+
return f64::abs(self - *other) < (fuzzy_epsilon as f64);
2527
}
2628
}
2729

2830
#[test]
2931
fn test_fuzzy_equals() {
30-
assert ((1.0).fuzzy_eq(1.0));
31-
assert ((1.0f32).fuzzy_eq(1.0f32));
32-
assert ((1.0f64).fuzzy_eq(1.0f64));
32+
assert ((&1.0).fuzzy_eq(&1.0));
33+
assert ((&1.0f32).fuzzy_eq(&1.0f32));
34+
assert ((&1.0f64).fuzzy_eq(&1.0f64));
3335
}
3436

0 commit comments

Comments
 (0)