Merge pull request #17 from larsbergstrom/rustup_20140410

Upgrade to rust
servo · Apr 12, 2014 · baf9f22 · baf9f22
2 parents 1249802 + 7de2c6c
commit baf9f22
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/base.rs b/base.rs
@@ -9,7 +9,7 @@
 
 // this file defines CGFloat, as well as stubbed data types.
 
-use std::libc;
+use libc;
 
 // TODO: this is actually a libc::c_float on 32bit
 pub type CGFloat = libc::c_double;

diff --git a/data_provider.rs b/data_provider.rs
@@ -9,8 +9,8 @@
 
 use core_foundation::base::{CFRelease, CFTypeID, TCFType};
 
+use libc::{c_void, size_t};
 use std::cast;
-use std::libc::{c_void, size_t};
 use std::ptr;
 
 pub type CGDataProviderGetBytesCallback = *u8;

diff --git a/font.rs b/font.rs
@@ -10,7 +10,7 @@
 use core_foundation::base::{CFRelease, CFTypeID, TCFType};
 
 use data_provider::{CGDataProvider, CGDataProviderRef};
-use std::libc;
+use libc;
 
 pub type CGGlyph = libc::c_ushort;
 

diff --git a/lib.rs b/lib.rs
@@ -7,11 +7,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[crate_id = "github.com/mozilla-servo/rust-core-graphics#core_graphics:0.1"];
-#[crate_type = "lib"];
-#[crate_type = "dylib"];
-#[crate_type = "rlib"];
+#![crate_id = "github.com/mozilla-servo/rust-core-graphics#core_graphics:0.1"]
+#![crate_type = "lib"]
+#![crate_type = "dylib"]
+#![crate_type = "rlib"]
 
+extern crate libc;
 extern crate std;
 extern crate core_foundation;