Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-12 17:05:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Import the util crate as util rather than servo_util.

Browse source 
This used to conflict with the util crate from the standard library, which
has long since been removed.

The import in layout has not been changed because of a conflict with the
util mod there.
This commit is contained in:
Ms2ger 2015-01-29 12:16:41 +01:00
parent 221a343883
commit 505159a464
182 changed files with 294 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/gfx/platform/freetype/font.rs
View file

@ -6,9 +6,9 @@ extern crate freetype;
use font::{FontHandleMethods, FontMetrics, FontTableMethods};
use font::{FontTableTag, FractionalPixel};
use servo_util::geometry::Au;
use servo_util::geometry;
use servo_util::str::c_str_to_string;
use util::geometry::Au;
use util::geometry;
use util::str::c_str_to_string;
use platform::font_context::FontContextHandle;
use text::glyph::GlyphId;
use text::util::{float_to_fixed, fixed_to_float};

2
components/gfx/platform/freetype/font_list.rs
View file

@ -20,7 +20,7 @@ use fontconfig::fontconfig::{
FcObjectSetAdd, FcPatternGetInteger
};
use servo_util::str::c_str_to_string;
use util::str::c_str_to_string;
use libc;
use libc::{c_int, c_char};

4
components/gfx/platform/macos/font.rs
View file

@ -11,8 +11,8 @@ extern crate core_text;
use font::{FontHandleMethods, FontMetrics, FontTableMethods};
use font::FontTableTag;
use font::FractionalPixel;
use servo_util::geometry::{Au, px_to_pt};
use servo_util::geometry;
use util::geometry::{Au, px_to_pt};
use util::geometry;
use platform::macos::font_context::FontContextHandle;
use text::glyph::GlyphId;
use style::computed_values::{font_stretch, font_weight};