Auto merge of #16852 - servo:illegal_floating_point_literal_pattern, r=jdm+SimonSapin

Fix illegal_floating_point_literal_pattern again and rustup…

… to compiler that has it, to avoid regressing again.

Upgrade to (rustc 1.19.0-nightly (e17a1227a 2017-05-12)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16852)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-13 11:25:07 -05:00 committed by GitHub
commit 5e5d3559d9
4 changed files with 7 additions and 10 deletions

View file

@ -1660,11 +1660,7 @@ fn static_assert() {
pub fn clone_font_size_adjust(&self) -> longhands::font_size_adjust::computed_value::T {
use properties::longhands::font_size_adjust::computed_value::T;
match self.gecko.mFont.sizeAdjust {
-1.0 => T::None,
_ => T::Number(self.gecko.mFont.sizeAdjust),
}
T::from_gecko_adjust(self.gecko.mFont.sizeAdjust)
}
#[allow(non_snake_case)]

View file

@ -1064,9 +1064,10 @@ ${helpers.single_keyword_system("font-variant-caps",
impl T {
pub fn from_gecko_adjust(gecko: f32) -> Self {
match gecko {
-1.0 => T::None,
_ => T::Number(gecko),
if gecko == -1.0 {
T::None
} else {
T::Number(gecko)
}
}
}