diff --git a/components/gfx/font.rs b/components/gfx/font.rs index 6ee0fd58acd..8be825f3108 100644 --- a/components/gfx/font.rs +++ b/components/gfx/font.rs @@ -160,7 +160,7 @@ impl Font { let glyphs = Arc::new(glyphs); self.shape_cache.insert(ShapeCacheEntry { - text: text.to_string(), + text: text.into_string(), options: *options, }, glyphs.clone()); glyphs diff --git a/components/gfx/font_cache_task.rs b/components/gfx/font_cache_task.rs index f371300ffaa..a7bc98424ca 100644 --- a/components/gfx/font_cache_task.rs +++ b/components/gfx/font_cache_task.rs @@ -181,7 +181,7 @@ impl FontCache { // TODO(Issue #188): look up localized font family names if canonical name not found // look up canonical name if self.local_families.contains_key(family_name) { - debug!("FontList: Found font family with name={:s}", family_name.to_string()); + debug!("FontList: Found font family with name={:s}", family_name.as_slice()); let s = &mut self.local_families[*family_name]; if s.templates.len() == 0 { @@ -199,7 +199,7 @@ impl FontCache { None } else { - debug!("FontList: Couldn't find font family with name={:s}", family_name.to_string()); + debug!("FontList: Couldn't find font family with name={:s}", family_name.as_slice()); None } } diff --git a/components/gfx/font_context.rs b/components/gfx/font_context.rs index e77f5d2d8a1..bd8500318da 100644 --- a/components/gfx/font_context.rs +++ b/components/gfx/font_context.rs @@ -167,7 +167,7 @@ impl FontContext { if !cache_hit { let font_template = self.font_cache_task.get_font_template(family.name() - .to_string(), + .into_string(), desc.clone()); match font_template { Some(font_template) => { @@ -177,14 +177,14 @@ impl FontContext { style.font_variant); let layout_font = Rc::new(RefCell::new(layout_font)); self.layout_font_cache.push(LayoutFontCacheEntry { - family: family.name().to_string(), + family: family.name().into_string(), font: Some(layout_font.clone()), }); fonts.push(layout_font); } None => { self.layout_font_cache.push(LayoutFontCacheEntry { - family: family.name().to_string(), + family: family.name().into_string(), font: None, }); } diff --git a/components/gfx/font_template.rs b/components/gfx/font_template.rs index 3f4916b69c5..78d83f17a32 100644 --- a/components/gfx/font_template.rs +++ b/components/gfx/font_template.rs @@ -68,7 +68,7 @@ impl FontTemplate { }; FontTemplate { - identifier: identifier.to_string(), + identifier: identifier.into_string(), descriptor: None, weak_ref: maybe_weak_ref, strong_ref: maybe_strong_ref, diff --git a/components/gfx/platform/freetype/font_list.rs b/components/gfx/platform/freetype/font_list.rs index d0cf39fc303..6ba45b55171 100644 --- a/components/gfx/platform/freetype/font_list.rs +++ b/components/gfx/platform/freetype/font_list.rs @@ -127,13 +127,13 @@ pub fn get_system_default_family(generic_name: &str) -> Option { #[cfg(target_os="linux")] pub fn get_last_resort_font_families() -> Vec { vec!( - "Fira Sans".to_string(), - "DejaVu Sans".to_string(), - "Arial".to_string() + "Fira Sans".into_string(), + "DejaVu Sans".into_string(), + "Arial".into_string() ) } #[cfg(target_os="android")] pub fn get_last_resort_font_families() -> Vec { - vec!("Roboto".to_string()) + vec!("Roboto".into_string()) } diff --git a/components/gfx/platform/freetype/font_template.rs b/components/gfx/platform/freetype/font_template.rs index 663ea64ab29..79da895b52f 100644 --- a/components/gfx/platform/freetype/font_template.rs +++ b/components/gfx/platform/freetype/font_template.rs @@ -29,7 +29,7 @@ impl FontTemplateData { FontTemplateData { bytes: bytes, - identifier: identifier.to_string(), + identifier: identifier.into_string(), } } } diff --git a/components/gfx/platform/macos/font_list.rs b/components/gfx/platform/macos/font_list.rs index 0974ce3bf46..da0485713f8 100644 --- a/components/gfx/platform/macos/font_list.rs +++ b/components/gfx/platform/macos/font_list.rs @@ -42,5 +42,5 @@ pub fn get_system_default_family(_generic_name: &str) -> Option { } pub fn get_last_resort_font_families() -> Vec { - vec!("Arial Unicode MS".to_string(), "Arial".to_string()) + vec!("Arial Unicode MS".into_string(), "Arial".into_string()) } diff --git a/components/gfx/platform/macos/font_template.rs b/components/gfx/platform/macos/font_template.rs index 23cfea2a848..9bb6b753a11 100644 --- a/components/gfx/platform/macos/font_template.rs +++ b/components/gfx/platform/macos/font_template.rs @@ -34,7 +34,7 @@ impl FontTemplateData { FontTemplateData { ctfont: ctfont, - identifier: identifier.to_string(), + identifier: identifier.into_string(), } } } diff --git a/components/gfx/text/util.rs b/components/gfx/text/util.rs index 29060dbbc73..d39119935d7 100644 --- a/components/gfx/text/util.rs +++ b/components/gfx/text/util.rs @@ -199,21 +199,21 @@ fn test_transform_discard_newline() { /* FIXME: Fix and re-enable #[test] fn test_transform_compress_whitespace() { - let test_strs : ~[String] = ~[" foo bar".to_string(), - "foo bar ".to_string(), - "foo\n bar".to_string(), - "foo \nbar".to_string(), - " foo bar \nbaz".to_string(), - "foo bar baz".to_string(), - "foobarbaz\n\n".to_string()]; + let test_strs : ~[String] = ~[" foo bar".into_string(), + "foo bar ".into_string(), + "foo\n bar".into_string(), + "foo \nbar".into_string(), + " foo bar \nbaz".into_string(), + "foo bar baz".into_string(), + "foobarbaz\n\n".into_string()]; - let oracle_strs : ~[String] = ~[" foo bar".to_string(), - "foo bar ".to_string(), - "foo\n bar".to_string(), - "foo \nbar".to_string(), - " foo bar \nbaz".to_string(), - "foo bar baz".to_string(), - "foobarbaz\n\n".to_string()]; + let oracle_strs : ~[String] = ~[" foo bar".into_string(), + "foo bar ".into_string(), + "foo\n bar".into_string(), + "foo \nbar".into_string(), + " foo bar \nbaz".into_string(), + "foo bar baz".into_string(), + "foobarbaz\n\n".into_string()]; assert_eq!(test_strs.len(), oracle_strs.len()); let mode = CompressWhitespace; @@ -227,21 +227,21 @@ fn test_transform_compress_whitespace() { #[test] fn test_transform_compress_whitespace_newline() { - let test_strs : ~[String] = ~[" foo bar".to_string(), - "foo bar ".to_string(), - "foo\n bar".to_string(), - "foo \nbar".to_string(), - " foo bar \nbaz".to_string(), - "foo bar baz".to_string(), - "foobarbaz\n\n".to_string()]; + let test_strs : ~[String] = ~[" foo bar".into_string(), + "foo bar ".into_string(), + "foo\n bar".into_string(), + "foo \nbar".into_string(), + " foo bar \nbaz".into_string(), + "foo bar baz".into_string(), + "foobarbaz\n\n".into_string()]; - let oracle_strs : ~[String] = ~["foo bar".to_string(), - "foo bar ".to_string(), - "foo bar".to_string(), - "foo bar".to_string(), - " foo bar baz".to_string(), - "foo bar baz".to_string(), - "foobarbaz ".to_string()]; + let oracle_strs : ~[String] = ~["foo bar".into_string(), + "foo bar ".into_string(), + "foo bar".into_string(), + "foo bar".into_string(), + " foo bar baz".into_string(), + "foo bar baz".into_string(), + "foobarbaz ".into_string()]; assert_eq!(test_strs.len(), oracle_strs.len()); let mode = CompressionMode::CompressWhitespaceNewline;