From 7d804523b09ee78991953a20f32c39fa2eab5e41 Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Mon, 4 Aug 2014 22:55:27 -0600 Subject: [PATCH] Upgrade Rust. --- lib.rs | 2 ++ rendergl.rs | 8 ++++---- texturegl.rs | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib.rs b/lib.rs index 2ca524f..db5c1ff 100755 --- a/lib.rs +++ b/lib.rs @@ -12,6 +12,8 @@ #![feature(managed_boxes, phase)] +#![allow(raw_pointer_deriving)] + extern crate geom; extern crate libc; #[phase(plugin, link)] diff --git a/rendergl.rs b/rendergl.rs index bc423c1..6ad0705 100755 --- a/rendergl.rs +++ b/rendergl.rs @@ -345,19 +345,19 @@ impl RenderContext { } fn init_buffers() -> Buffers { - let textured_quad_vertex_buffer = *gen_buffers(1).get(0); + let textured_quad_vertex_buffer = gen_buffers(1)[0]; bind_buffer(ARRAY_BUFFER, textured_quad_vertex_buffer); buffer_data(ARRAY_BUFFER, TEXTURED_QUAD_VERTICES, STATIC_DRAW); - let line_quad_vertex_buffer = *gen_buffers(1).get(0); + let line_quad_vertex_buffer = gen_buffers(1)[0]; bind_buffer(ARRAY_BUFFER, line_quad_vertex_buffer); buffer_data(ARRAY_BUFFER, LINE_QUAD_VERTICES, STATIC_DRAW); - let texture_coordinate_buffer = *gen_buffers(1).get(0); + let texture_coordinate_buffer = gen_buffers(1)[0]; bind_buffer(ARRAY_BUFFER, texture_coordinate_buffer); buffer_data(ARRAY_BUFFER, TEXTURE_COORDINATES, STATIC_DRAW); - let flipped_texture_coordinate_buffer = *gen_buffers(1).get(0); + let flipped_texture_coordinate_buffer = gen_buffers(1)[0]; bind_buffer(ARRAY_BUFFER, flipped_texture_coordinate_buffer); buffer_data(ARRAY_BUFFER, FLIPPED_TEXTURE_COORDINATES, STATIC_DRAW); diff --git a/texturegl.rs b/texturegl.rs index 782d2cd..449374a 100644 --- a/texturegl.rs +++ b/texturegl.rs @@ -120,7 +120,7 @@ impl Texture { /// Creates a new blank texture. pub fn new(target: TextureTarget, size: Size2D) -> Texture { let this = Texture { - id: *gl2::gen_textures(1).get(0), + id: gl2::gen_textures(1)[0], target: target, weak: false, flip: NoFlip,