Merge pull request #318 from csherratt/fix_master

Update for rust-lang/rust#16453

Author: emberian

src/device/gl/mod.rs

@@ -400,7 +400,7 @@ impl ::Device for GlDevice {
         ::BufferHandle::from_raw(::Handle(name, info))
     }
 
-    fn create_buffer_static<T>(&mut self, data: &::Blob<T>) -> ::BufferHandle<T> {
+    fn create_buffer_static<'a, T>(&mut self, data: &::Blob<T>+'a) -> ::BufferHandle<T> {
         let name = self.create_buffer_internal();
         let info = ::BufferInfo {
             usage: ::UsageStatic,

src/device/lib.rs

@@ -179,7 +179,7 @@ pub trait Blob<T> {
 /// Helper trait for casting &Blob
 pub trait RefBlobCast<'a> {
     /// Cast the type the blob references
-    fn cast<U>(self) -> &'a Blob<U>;
+    fn cast<U>(self) -> &'a Blob<U>+'a;
 }
 
 /// Helper trait for casting Box<Blob>
@@ -188,8 +188,8 @@ pub trait BoxBlobCast {
     fn cast<U>(self) -> Box<Blob<U> + Send>;
 }
 
-impl<'a, T> RefBlobCast<'a> for &'a Blob<T> {
-    fn cast<U>(self) -> &'a Blob<U> {
+impl<'a, T> RefBlobCast<'a> for &'a Blob<T>+'a {
+    fn cast<U>(self) -> &'a Blob<U>+'a {
         unsafe { std::mem::transmute(self) }
     }
 }

src/examples/cube/main.rs

@@ -172,7 +172,7 @@ fn main() {
     ];
 
     let slice = {
-        let buf = device.create_buffer_static(&index_data);
+        let buf = device.create_buffer_static(&index_data.as_slice());
         gfx::IndexSlice8(gfx::TriangleList, buf, 0, 36)
     };
 
@@ -187,7 +187,7 @@ fn main() {
     let image_info = texture_info.to_image_info();
     let texture = device.create_texture(texture_info).unwrap();
     device.update_texture(&texture, &image_info,
-                          &vec![0x20u8, 0xA0u8, 0xC0u8, 0x00u8])
+                          &vec![0x20u8, 0xA0u8, 0xC0u8, 0x00u8].as_slice())
         .unwrap();
 
     let sampler = device.create_sampler(