4 files changed, 40 insertions, 40 deletions

diff --git a/components/gfx/text/mod.rs b/components/gfx/text/mod.rs
index 24c434e2e69..c65359ae1dd 100644
--- a/components/gfx/text/mod.rs
+++ b/components/gfx/text/mod.rs
@@ -2,8 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-pub use text::shaping::Shaper;
-pub use text::text_run::TextRun;
+pub use crate::text::shaping::Shaper;
+pub use crate::text::text_run::TextRun;
 
 pub mod glyph;
 pub mod shaping;
diff --git a/components/gfx/text/shaping/harfbuzz.rs b/components/gfx/text/shaping/harfbuzz.rs
index eb6b7b8cd4a..dc25783cb11 100644
--- a/components/gfx/text/shaping/harfbuzz.rs
+++ b/components/gfx/text/shaping/harfbuzz.rs
@@ -6,39 +6,39 @@
 
 use app_units::Au;
 use euclid::Point2D;
-use font::{ShapingFlags, Font, FontTableMethods, FontTableTag, ShapingOptions, KERN};
-use harfbuzz::{HB_DIRECTION_LTR, HB_DIRECTION_RTL, HB_MEMORY_MODE_READONLY};
-use harfbuzz::{hb_blob_create, hb_face_create_for_tables};
-use harfbuzz::{hb_buffer_create, hb_font_destroy};
-use harfbuzz::{hb_buffer_get_glyph_infos, hb_shape};
-use harfbuzz::{hb_buffer_set_direction, hb_buffer_set_script};
-use harfbuzz::{hb_buffer_t, hb_codepoint_t, hb_font_funcs_t};
-use harfbuzz::{hb_face_t, hb_font_t};
-use harfbuzz::{hb_position_t, hb_tag_t};
-use harfbuzz::hb_blob_t;
-use harfbuzz::hb_bool_t;
-use harfbuzz::hb_buffer_add_utf8;
-use harfbuzz::hb_buffer_destroy;
-use harfbuzz::hb_buffer_get_glyph_positions;
-use harfbuzz::hb_buffer_get_length;
-use harfbuzz::hb_face_destroy;
-use harfbuzz::hb_feature_t;
-use harfbuzz::hb_font_create;
-use harfbuzz::hb_font_funcs_create;
-use harfbuzz::hb_font_funcs_set_glyph_h_advance_func;
-use harfbuzz::hb_font_funcs_set_glyph_h_kerning_func;
-use harfbuzz::hb_font_funcs_set_nominal_glyph_func;
-use harfbuzz::hb_font_set_funcs;
-use harfbuzz::hb_font_set_ppem;
-use harfbuzz::hb_font_set_scale;
-use harfbuzz::hb_glyph_info_t;
-use harfbuzz::hb_glyph_position_t;
-use platform::font::FontTable;
+use crate::font::{ShapingFlags, Font, FontTableMethods, FontTableTag, ShapingOptions, KERN};
+use crate::harfbuzz::{HB_DIRECTION_LTR, HB_DIRECTION_RTL, HB_MEMORY_MODE_READONLY};
+use crate::harfbuzz::{hb_blob_create, hb_face_create_for_tables};
+use crate::harfbuzz::{hb_buffer_create, hb_font_destroy};
+use crate::harfbuzz::{hb_buffer_get_glyph_infos, hb_shape};
+use crate::harfbuzz::{hb_buffer_set_direction, hb_buffer_set_script};
+use crate::harfbuzz::{hb_buffer_t, hb_codepoint_t, hb_font_funcs_t};
+use crate::harfbuzz::{hb_face_t, hb_font_t};
+use crate::harfbuzz::{hb_position_t, hb_tag_t};
+use crate::harfbuzz::hb_blob_t;
+use crate::harfbuzz::hb_bool_t;
+use crate::harfbuzz::hb_buffer_add_utf8;
+use crate::harfbuzz::hb_buffer_destroy;
+use crate::harfbuzz::hb_buffer_get_glyph_positions;
+use crate::harfbuzz::hb_buffer_get_length;
+use crate::harfbuzz::hb_face_destroy;
+use crate::harfbuzz::hb_feature_t;
+use crate::harfbuzz::hb_font_create;
+use crate::harfbuzz::hb_font_funcs_create;
+use crate::harfbuzz::hb_font_funcs_set_glyph_h_advance_func;
+use crate::harfbuzz::hb_font_funcs_set_glyph_h_kerning_func;
+use crate::harfbuzz::hb_font_funcs_set_nominal_glyph_func;
+use crate::harfbuzz::hb_font_set_funcs;
+use crate::harfbuzz::hb_font_set_ppem;
+use crate::harfbuzz::hb_font_set_scale;
+use crate::harfbuzz::hb_glyph_info_t;
+use crate::harfbuzz::hb_glyph_position_t;
+use crate::platform::font::FontTable;
 use std::{char, cmp, ptr};
 use std::os::raw::{c_char, c_int, c_uint, c_void};
-use text::glyph::{ByteIndex, GlyphData, GlyphId, GlyphStore};
-use text::shaping::ShaperMethods;
-use text::util::{fixed_to_float, float_to_fixed, is_bidi_control};
+use crate::text::glyph::{ByteIndex, GlyphData, GlyphId, GlyphStore};
+use crate::text::shaping::ShaperMethods;
+use crate::text::util::{fixed_to_float, float_to_fixed, is_bidi_control};
 
 const NO_GLYPH: i32 = -1;
 const LIGA: u32 = ot_tag!('l', 'i', 'g', 'a');
diff --git a/components/gfx/text/shaping/mod.rs b/components/gfx/text/shaping/mod.rs
index 97d96980596..8c59c13427a 100644
--- a/components/gfx/text/shaping/mod.rs
+++ b/components/gfx/text/shaping/mod.rs
@@ -7,10 +7,10 @@
 //!
 //! Currently, only harfbuzz bindings are implemented.
 
-use font::ShapingOptions;
-use text::glyph::GlyphStore;
+use crate::font::ShapingOptions;
+use crate::text::glyph::GlyphStore;
 
-pub use text::shaping::harfbuzz::Shaper;
+pub use crate::text::shaping::harfbuzz::Shaper;
 
 pub mod harfbuzz;
 
diff --git a/components/gfx/text/text_run.rs b/components/gfx/text/text_run.rs
index 3eab1cd738d..c97575bf636 100644
--- a/components/gfx/text/text_run.rs
+++ b/components/gfx/text/text_run.rs
@@ -3,16 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use app_units::Au;
-use font::{Font, FontHandleMethods, FontMetrics, ShapingFlags};
-use font::{RunMetrics, ShapingOptions};
-use platform::font_template::FontTemplateData;
+use crate::font::{Font, FontHandleMethods, FontMetrics, ShapingFlags};
+use crate::font::{RunMetrics, ShapingOptions};
+use crate::platform::font_template::FontTemplateData;
 use range::Range;
 use std::cell::Cell;
 use std::cmp::{Ordering, max};
 use std::slice::Iter;
 use std::sync::Arc;
 use style::str::char_is_whitespace;
-use text::glyph::{ByteIndex, GlyphStore};
+use crate::text::glyph::{ByteIndex, GlyphStore};
 use unicode_bidi as bidi;
 use webrender_api;
 use xi_unicode::LineBreakLeafIter;