Fixed changing alt syntax

jdm · Aug 6, 2012 · f071d5e · f071d5e
1 parent a3ddb0b
commit f071d5e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/layers.rs b/layers.rs
@@ -67,10 +67,10 @@ class Image {
 
     drop {
         alt copy self.texture {
-            none {
+            none => {
                 // Nothing to do.
             }
-            some(texture) {
+            some(texture) => {
                 delete_textures(&[texture]);
             }
         }

diff --git a/rendergl.rs b/rendergl.rs
@@ -152,8 +152,8 @@ fn init_buffers() -> (GLuint, GLuint) {
 
 fn create_texture_for_image_if_necessary(image: @Image) {
     alt image.texture {
-        none {}
-        some(_) { return; /* Nothing to do. */ }
+        none => {}
+        some(_) => { return; /* Nothing to do. */ }
     }
 
     #debug("making texture");
@@ -169,14 +169,14 @@ fn create_texture_for_image_if_necessary(image: @Image) {
     pixel_store_i(UNPACK_ALIGNMENT, 1);
 
     alt image.format {
-        RGB24Format {
-            tex_image_2d(TEXTURE_2D, 0 as GLint, RGB as GLint, image.width as GLsizei,
-                         image.height as GLsizei, 0 as GLint, RGB, UNSIGNED_BYTE, image.data);
-        }
-        ARGB32Format {
-            tex_image_2d(TEXTURE_2D, 0 as GLint, RGBA as GLint, image.width as GLsizei,
-                         image.height as GLsizei, 0 as GLint, BGRA, UNSIGNED_BYTE, image.data);
-        }
+      RGB24Format => {
+        tex_image_2d(TEXTURE_2D, 0 as GLint, RGB as GLint, image.width as GLsizei,
+                     image.height as GLsizei, 0 as GLint, RGB, UNSIGNED_BYTE, image.data);
+      }
+      ARGB32Format => {
+        tex_image_2d(TEXTURE_2D, 0 as GLint, RGBA as GLint, image.width as GLsizei,
+                     image.height as GLsizei, 0 as GLint, BGRA, UNSIGNED_BYTE, image.data);
+      }
     }
 
     image.texture = some(texture);
@@ -248,15 +248,9 @@ fn render_scene(render_context: RenderContext, &scene: Scene) {
     uniform_matrix_4fv(render_context.projection_uniform, false, projection_matrix.to_array());
 
     alt copy scene.root {
-        ContainerLayerKind(*) {
-            fail ~"container layers unsupported";
-        }
-        ImageLayerKind(image_layer) {
-            image_layer.render(render_context);
-        }
-        TiledImageLayerKind(tiled_image_layer) {
-            tiled_image_layer.render(render_context);
-        }
+        ContainerLayerKind(*) => fail ~"container layers unsupported",
+        ImageLayerKind(image_layer) => image_layer.render(render_context),
+        TiledImageLayerKind(tiled_image_layer) => tiled_image_layer.render(render_context)
     }
 }
 
diff --git a/test.rs b/test.rs
@@ -85,16 +85,16 @@ struct Renderer {
 
     fn display_callback() {
         alt self.render_context {
-            none {
+            none => {
                 self.render_context = some(init_render_context());
             }
-            some(_) {
+            some(_) => {
                 // Nothing to do.
             }
         }
         let context = alt self.render_context {
-            none { fail }
-            some(ctx) { ctx }
+            none => fail,
+            some(ctx) => ctx
         };
 
         let t = self.t;