Skip to content

Commit 2580040

Browse files
committed
Remove deprecated modes from FuzzyEq in cmp.rs
This commit may require changes to the following Servo files: * rust-geom/matrix.rs * servo/platform/osmain.rs * rust-layers/layers.rs * rust-geom/matrix.rs
1 parent 340a219 commit 2580040

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

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)