aboutsummaryrefslogtreecommitdiffstats
path: root/components/gfx/platform/windows/font.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-11-07 08:47:57 -0500
committerGitHub <noreply@github.com>2018-11-07 08:47:57 -0500
commitda2d9b2228441863feba2af2a60f84d2657fb962 (patch)
tree760c0eb675e95b46890480a9e10bc2c2cc714512 /components/gfx/platform/windows/font.rs
parent618a790050d8eab39e3c44b3d39dfefa7648445e (diff)
parent1855c88d6106c73febec1f5f29e246a75ff2f849 (diff)
downloadservo-da2d9b2228441863feba2af2a60f84d2657fb962.tar.gz
servo-da2d9b2228441863feba2af2a60f84d2657fb962.zip
Auto merge of #22126 - pyfisch:autoformat, r=jdm
Enforce rustfmt on CI <!-- 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/22126) <!-- Reviewable:end -->
Diffstat (limited to 'components/gfx/platform/windows/font.rs')
-rw-r--r--components/gfx/platform/windows/font.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/components/gfx/platform/windows/font.rs b/components/gfx/platform/windows/font.rs
index 9fb075aa027..b654b47e0cb 100644
--- a/components/gfx/platform/windows/font.rs
+++ b/components/gfx/platform/windows/font.rs
@@ -23,8 +23,8 @@ use std::sync::Arc;
use style::computed_values::font_stretch::T as StyleFontStretch;
use style::computed_values::font_weight::T as StyleFontWeight;
use style::values::computed::font::FontStyle as StyleFontStyle;
-use style::values::generics::NonNegative;
use style::values::generics::font::FontStyle as GenericFontStyle;
+use style::values::generics::NonNegative;
use style::values::specified::font::FontStretchKeyword;
use truetype;
@@ -119,7 +119,7 @@ struct FontInfo {
impl FontInfo {
fn new_from_face(face: &FontFace) -> Result<FontInfo, ()> {
- use std::cmp::{min, max};
+ use std::cmp::{max, min};
use std::io::Cursor;
use truetype::{NamingTable, Value, WindowsMetrics};
@@ -187,7 +187,8 @@ impl FontInfo {
8 => FontStretchKeyword::ExtraExpanded,
9 => FontStretchKeyword::UltraExpanded,
_ => return Err(()),
- }.compute(),
+ }
+ .compute(),
));
let style = if italic_bool {
@@ -224,7 +225,8 @@ impl FontInfo {
FontStretch::Expanded => FontStretchKeyword::Expanded,
FontStretch::ExtraExpanded => FontStretchKeyword::ExtraExpanded,
FontStretch::UltraExpanded => FontStretchKeyword::UltraExpanded,
- }.compute(),
+ }
+ .compute(),
));
Ok(FontInfo {