Auto merge of #37 - pcwalton:clamp, r=Manishearth

bors-servo · web-flow · commit 26d07cdf0420 · 2017-09-08T01:02:34.000-05:00
Explicitly invoke `Au::clamp()` to avoid colliding with the unstable Rust library method of the same name. Fixes breakage from rust-lang/rust#44095. r? @Manishearth
diff --git a/src/app_unit.rs b/src/app_unit.rs
@@ -189,7 +189,7 @@ impl Au {
 
     #[inline]
     fn clamp_self(&mut self) {
-        *self = self.clamp()
+        *self = Au::clamp(*self)
     }
 
     #[inline]

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ impl Au {`
`189`	`189`
`190`	`190`	`#[inline]`
`191`	`191`	`fn clamp_self(&mut self) {`
`192`		`- *self = self.clamp()`
	`192`	`+ self = Au::clamp(self)`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`#[inline]`