Updated to recent nightly Rust

As of rustc 1.0.0-nightly (ea6f65c5f 2015-01-06 19:47:08 +0000)
gi-rust · Jan 8, 2015 · 37e4549 · 37e4549
1 parent 23361c3
commit 37e4549
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/fauxgen/gio.rs b/fauxgen/gio.rs
@@ -20,7 +20,6 @@
 
 #![crate_type = "lib"]
 
-#![feature(associated_types)]
 #![feature(unboxed_closures)]
 
 extern crate grust;

diff --git a/fauxgen/gobject.rs b/fauxgen/gobject.rs
@@ -20,8 +20,6 @@
 
 #![crate_type = "lib"]
 
-#![feature(associated_types)]
-
 extern crate grust;
 extern crate "grust-GLib-2_0" as glib;
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -19,9 +19,6 @@
 #![crate_name = "grust"]
 #![crate_type = "lib"]
 
-#![feature(associated_types)]
-#![feature(macro_rules)]
-#![feature(unboxed_closures)]
 #![feature(unsafe_destructor)]
 
 extern crate libc;

diff --git a/src/wrap.rs b/src/wrap.rs
@@ -34,18 +34,18 @@ pub unsafe trait Wrapper {
 }
 
 #[inline]
-pub unsafe fn from_raw<'a, T, Sized? U>(ptr: *const <T as Wrapper>::Raw,
-                                        life_anchor: &'a U)
+pub unsafe fn from_raw<'a, T, U: ?Sized>(ptr: *const <T as Wrapper>::Raw,
+                                         life_anchor: &'a U)
                                         -> &'a T
     where T: Wrapper
 {
     mem::copy_lifetime(life_anchor, &*(ptr as *const T))
 }
 
 #[inline]
-pub unsafe fn from_raw_mut<'a, T, Sized? U>(ptr: *mut <T as Wrapper>::Raw,
-                                            _life_anchor: &'a U)
-                                           -> &'a mut T
+pub unsafe fn from_raw_mut<'a, T, U: ?Sized>(ptr: *mut <T as Wrapper>::Raw,
+                                             _life_anchor: &'a U)
+                                            -> &'a mut T
     where T: Wrapper
 {
     mem::transmute(&*(ptr as *mut T))