Rust upgrade for android

9 files changed, 12 insertions, 12 deletions

diff --git a/Makefile.in b/Makefile.in
index fb2746e42d2..34fa06f0d23 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ ifdef CFG_DISABLE_OPTIMIZE
   $(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE))
   CFG_RUSTC_FLAGS +=
 else
-  CFG_RUSTC_FLAGS += -O -Z no-debug-borrows
+  CFG_RUSTC_FLAGS += -O
 endif
 
 CFG_RUSTC_FLAGS += -g
@@ -326,7 +326,7 @@ servo:	$(DEPS_servo)
 else
 servo:  $(DEPS_servo)
 	@$(call E, compile: $@)
-	$(Q)$(RUSTC) $(RFLAGS_servo) -Z gen-crate-map -o $@ $< --crate-type lib
+	$(Q)$(RUSTC) $(RFLAGS_servo) -C gen-crate-map -o $@ $< --crate-type lib
 endif
 
 # Darwin app packaging
diff --git a/configure b/configure
index 6fa3ecdcbeb..6973835cdad 100755
--- a/configure
+++ b/configure
@@ -385,7 +385,7 @@ case ${TARGET_OSTYPE} in
         probe CFG_RANLIB	       arm-linux-androideabi-ranlib
 
         export PATH=${OLD_PATH}
-        CFG_RUSTC_FLAGS="--target=${CFG_TARGET_TRIPLES} --android-cross-path=${CFG_ANDROID_CROSS_PATH}"
+        CFG_RUSTC_FLAGS="--target=${CFG_TARGET_TRIPLES} -C android-cross-path=${CFG_ANDROID_CROSS_PATH}"
         ;;
     *)
         CFG_PATH=$PATH
diff --git a/src/components/gfx/platform/android/font.rs b/src/components/gfx/platform/android/font.rs
index 77c522e7c2a..26e684fc0c0 100644
--- a/src/components/gfx/platform/android/font.rs
+++ b/src/components/gfx/platform/android/font.rs
@@ -102,7 +102,7 @@ impl FontHandleMethods for FontHandle {
                  let mut face: FT_Face = ptr::null();
                  let face_index = 0 as FT_Long;
                  let result = FT_New_Memory_Face(lib, cbuf, cbuflen as FT_Long,
-                                                 face_index, ptr::to_mut_unsafe_ptr(&mut face));
+                                                 face_index, &mut face);
                  
                  if !result.succeeded() || face.is_null() {
                      return Err(());
@@ -286,7 +286,7 @@ impl<'a> FontHandle {
             let face_index = 0 as FT_Long;
             file.to_c_str().with_ref(|file_str| {
                 FT_New_Face(ft_ctx, file_str,
-                            face_index, ptr::to_mut_unsafe_ptr(&mut face));
+                            face_index, &mut face);
             });
             if face.is_null() {
                 return Err(());
@@ -313,7 +313,7 @@ impl<'a> FontHandle {
             let face_index = 0 as FT_Long;
             file.to_c_str().with_ref(|file_str| {
                 FT_New_Face(ft_ctx, file_str,
-                            face_index, ptr::to_mut_unsafe_ptr(&mut face));
+                            face_index, &mut face);
             });
             if face.is_null() {
                 return Err(());
diff --git a/src/components/gfx/platform/android/font_context.rs b/src/components/gfx/platform/android/font_context.rs
index 3aa9e064281..b8690904a67 100644
--- a/src/components/gfx/platform/android/font_context.rs
+++ b/src/components/gfx/platform/android/font_context.rs
@@ -14,7 +14,7 @@ use std::ptr;
 use std::rc::Rc;
 
 #[deriving(Clone)]
-struct FreeTypeLibraryHandle {
+pub struct FreeTypeLibraryHandle {
     ctx: FT_Library,
 }
 
diff --git a/src/components/gfx/platform/android/font_list.rs b/src/components/gfx/platform/android/font_list.rs
index 44f37120a3c..e372d891797 100644
--- a/src/components/gfx/platform/android/font_list.rs
+++ b/src/components/gfx/platform/android/font_list.rs
@@ -25,7 +25,7 @@ use font_list::{FontEntry, FontFamily, FontFamilyMap};
 use platform::font::FontHandle;
 use platform::font_context::FontContextHandle;
 
-use std::hashmap::HashMap;
+use collections::hashmap::HashMap;
 use std::libc;
 use std::libc::{c_int, c_char};
 use std::ptr;
@@ -68,7 +68,7 @@ impl FontListHandle {
         unsafe {
             let config = FcConfigGetCurrent();
             let font_set = FcConfigGetFonts(config, FcSetSystem);
-            let font_set_array_ptr = ptr::to_unsafe_ptr(&font_set);
+            let font_set_array_ptr = &font_set;
             let pattern = FcPatternCreate();
             assert!(pattern.is_not_null());
             "family".to_c_str().with_ref(|FC_FAMILY| {
diff --git a/src/components/main/platform/common/glut_windowing.rs b/src/components/main/platform/common/glut_windowing.rs
index ccb0c7411ab..6a344e7f74b 100644
--- a/src/components/main/platform/common/glut_windowing.rs
+++ b/src/components/main/platform/common/glut_windowing.rs
@@ -132,7 +132,7 @@ impl WindowMethods<Application> for Window {
         }
         glut::mouse_func(~MouseCallbackState);
 
-        let wrapped_window = Rc::from_send(window);
+        let wrapped_window = Rc::new(window);
 
         install_local_window(wrapped_window.clone());
 
@@ -151,11 +151,11 @@ impl WindowMethods<Application> for Window {
     
     fn recv(&self) -> WindowEvent {
         if !self.event_queue.with_mut(|queue| queue.is_empty()) {
-            return self.event_queue.with_mut(|queue| queue.shift())
+            return self.event_queue.with_mut(|queue| queue.shift().unwrap())
         }
         glut::check_loop();
         if !self.event_queue.with_mut(|queue| queue.is_empty()) {
-            self.event_queue.with_mut(|queue| queue.shift())
+            self.event_queue.with_mut(|queue| queue.shift().unwrap())
         } else {
             IdleWindowEvent
         }
diff --git a/src/support/egl/rust-egl b/src/support/egl/rust-egl
-Subproject 0c0484e0c07a3e5ef3184f6182c96c354a06eeb
+Subproject ba3d7feda3962f427792c331ddad38ae417b543
diff --git a/src/support/glut/rust-glut b/src/support/glut/rust-glut
-Subproject 4481eff133bd63af85990844094486cb4abb524
+Subproject beb749916d07c16892cdc18f188bbc8fc2f22e7
diff --git a/src/support/layers/rust-layers b/src/support/layers/rust-layers
-Subproject bc0e042ad80bf2cfee8d32e5dd2216616936d5c
+Subproject 2388f74ffff633ba76f30472b010c06c26f0c18