From a65a4fd15a3d9736cd9842b4fe3ea8c944188557 Mon Sep 17 00:00:00 2001 From: Steven Sheldon Date: Fri, 3 Apr 2015 02:30:29 -0700 Subject: [PATCH 1/2] Removed unstable clone_from method so OSX can compile. --- src/cocoa/mod.rs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/cocoa/mod.rs b/src/cocoa/mod.rs index e756aba3..ca9d888b 100644 --- a/src/cocoa/mod.rs +++ b/src/cocoa/mod.rs @@ -719,15 +719,5 @@ impl Clone for IdRef { } IdRef(self.0) } - - fn clone_from(&mut self, source: &IdRef) { - if source.0 != nil { - let _: id = unsafe { msg_send![source.0, retain] }; - } - if self.0 != nil { - let _: () = unsafe { msg_send![self.0, release] }; - } - self.0 = source.0; - } } From 9c21758bb73f18cf8f6a3f61f426af8bde00964a Mon Sep 17 00:00:00 2001 From: Steven Sheldon Date: Fri, 3 Apr 2015 02:31:15 -0700 Subject: [PATCH 2/2] Removed unused features from build and examples. --- build.rs | 2 -- examples-disabled/fullscreen.rs | 2 -- examples/cursor.rs | 2 -- examples/grabbing.rs | 2 -- examples/multiwindow.rs | 2 -- examples/vsync.rs | 2 -- examples/window.rs | 2 -- 7 files changed, 14 deletions(-) diff --git a/build.rs b/build.rs index 7aeeda91..9925e2d0 100644 --- a/build.rs +++ b/build.rs @@ -1,5 +1,3 @@ -#![feature(convert)] - extern crate gl_generator; extern crate khronos_api; diff --git a/examples-disabled/fullscreen.rs b/examples-disabled/fullscreen.rs index 37ea3669..3b9e2c1e 100644 --- a/examples-disabled/fullscreen.rs +++ b/examples-disabled/fullscreen.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/cursor.rs b/examples/cursor.rs index c5bcbd6e..0dced66d 100644 --- a/examples/cursor.rs +++ b/examples/cursor.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/grabbing.rs b/examples/grabbing.rs index 80887744..8a467509 100644 --- a/examples/grabbing.rs +++ b/examples/grabbing.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/multiwindow.rs b/examples/multiwindow.rs index 92565552..ce97266c 100644 --- a/examples/multiwindow.rs +++ b/examples/multiwindow.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/vsync.rs b/examples/vsync.rs index 768bfc08..ec9ea79f 100644 --- a/examples/vsync.rs +++ b/examples/vsync.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue; diff --git a/examples/window.rs b/examples/window.rs index 0e2a3cf8..1d3b6158 100644 --- a/examples/window.rs +++ b/examples/window.rs @@ -1,5 +1,3 @@ -#![feature(std_misc)] - #[cfg(target_os = "android")] #[macro_use] extern crate android_glue;