Merge pull request #34 from servo/rustup_20150109

Fix usage of from_str and prelude removals; r=Ms2ger

src/font.rs

@@ -138,7 +138,7 @@ pub fn new_from_descriptor(desc: &CTFontDescriptor, pt_size: f64) -> CTFont {
 
 pub fn new_from_name(name: &str, pt_size: f64) -> Result<CTFont, ()> {
     unsafe {
-        let name: CFString = from_str(name).unwrap();
+        let name: CFString = name.parse().unwrap();
         let font_ref = CTFontCreateWithName(name.as_concrete_TypeRef(),
                                             pt_size as CGFloat,
                                             ptr::null());

src/font_collection.rs

@@ -19,6 +19,7 @@ use core_foundation::set::CFSet;
 use core_foundation::string::{CFString, CFStringRef};
 
 use std::mem;
+use std::num::FromPrimitive;
 use std::ptr;
 
 #[repr(C)]
@@ -110,7 +111,7 @@ pub fn create_for_family(family: &str) -> Option<CTFontCollection> {
 
     unsafe {
         let family_attr: CFString = TCFType::wrap_under_get_rule(kCTFontFamilyNameAttribute);
-        let family_name: CFString = from_str(family).unwrap();
+        let family_name: CFString = family.parse().unwrap();
         let specified_attrs = CFDictionary::from_CFType_pairs(&[
             (family_attr.as_CFType(), family_name.as_CFType())
         ]);

src/font_descriptor.rs

@@ -19,6 +19,7 @@ use core_foundation::url::{CFURL, CFURLRef};
 use core_graphics::base::CGFloat;
 
 use std::mem;
+use std::num::ToPrimitive;
 
 /*
 * CTFontTraits.h
@@ -272,12 +273,12 @@ impl CTFontDescriptor {
     pub fn font_path(&self) -> String {
         unsafe {
             let value = CTFontDescriptorCopyAttribute(self.obj, kCTFontURLAttribute);
-            assert!(value.is_not_null());
+            assert!(!value.is_null());
 
             let value: CFType = TCFType::wrap_under_get_rule(value);
             assert!(value.instance_of::<CFURLRef,CFURL>());
             let url: CFURL = TCFType::wrap_under_get_rule(mem::transmute(value.as_CFTypeRef()));
-            url.to_string()
+            format!("{:?}", url)
         }
     }
 }