Merge pull request #8 from metajack/rustup

Fix visibility for mac.

font.rs

@@ -300,7 +300,7 @@ impl CTFontMethods for CTFont {
 }
 
 // Helper methods
-priv fn get_string_by_name_key(font: &CTFont, name_key: CFStringRef) -> Option<~str> {
+fn get_string_by_name_key(font: &CTFont, name_key: CFStringRef) -> Option<~str> {
     unsafe {
         let result = CTFontCopyName(*font.borrow_ref(), name_key);
         if result.is_null() { return None; }

font_descriptor.rs

@@ -123,12 +123,12 @@ pub trait TraitAccessors {
     fn normalized_slant(&self) -> float;
 }
 
-priv trait TraitAccessorPrivate {
+trait TraitAccessorPrivate {
     fn extract_number_for_key(&self, key: CFStringRef) -> CFNumber;
 }
 
 impl TraitAccessorPrivate for CTFontTraits {
-    priv fn extract_number_for_key(&self, key: CFStringRef) -> CFNumber {
+    fn extract_number_for_key(&self, key: CFStringRef) -> CFNumber {
         let value = self.get(&key);
         CFNumber::wrap_shared(core_foundation::base::downcast::<CFNumberRef>(value))
     }
@@ -204,12 +204,12 @@ pub trait CTFontDescriptorMethods {
     fn font_path(&self) -> ~str;
 }
 
-priv trait CTFontDescriptorMethodsPrivate {
+trait CTFontDescriptorMethodsPrivate {
     fn get_string_attribute(&self, attribute: CFStringRef) -> Option<~str>;
 }
 
 impl CTFontDescriptorMethodsPrivate for CTFontDescriptor {
-    priv fn get_string_attribute(&self, attribute: CFStringRef) -> Option<~str> {
+    fn get_string_attribute(&self, attribute: CFStringRef) -> Option<~str> {
         unsafe {
             let value = CTFontDescriptorCopyAttribute(self.obj, attribute);
             if value.is_null() {
@@ -334,7 +334,7 @@ extern {
     fn CTFontDescriptorGetTypeID() -> CFTypeID;
 }
 
-pub extern {
+extern {
     fn CTFontDescriptorCreateMatchingFontDescriptors(descriptor: CTFontDescriptorRef,
                                                      mandatoryAttributes: CFSetRef) -> CFArrayRef;
 }

font_manager.rs

@@ -10,7 +10,7 @@
 use core_foundation::array::CFArrayRef;
 use core_foundation::url::CFURLRef;
 
-pub extern {
+extern {
     /*
      * CTFontManager.h
      */