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

Move to to_owned rather than into_string.

Browse source 
into_string has been removed from Rust.
This commit is contained in:
Ms2ger 2015-01-20 14:45:36 +01:00
parent 2d5b0e0855
commit 01ed338746
67 changed files with 473 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,8 @@ use core_foundation::base::TCFType;
use core_foundation::string::{CFString, CFStringRef};
use core_text::font_descriptor::{CTFontDescriptor, CTFontDescriptorRef};
use core_text;
use std::borrow::ToOwned;
use std::mem;
pub fn get_available_families(callback: |String|) {
@ -42,5 +44,5 @@ pub fn get_system_default_family(_generic_name: &str) -> Option<String> {
}
pub fn get_last_resort_font_families() -> Vec<String> {
vec!("Arial Unicode MS".into_string(), "Arial".into_string())
vec!("Arial Unicode MS".to_owned(), "Arial".to_owned())
}

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

@ -7,6 +7,8 @@ use core_graphics::font::CGFont;
use core_text::font::CTFont;
use core_text;
use std::borrow::ToOwned;
/// Platform specific font representation for mac.
/// The identifier is a PostScript font name. The
/// CTFont object is cached here for use by the
@ -34,7 +36,7 @@ impl FontTemplateData {
FontTemplateData {
ctfont: ctfont,
identifier: identifier.into_string(),
identifier: identifier.to_owned(),
}
}
}