From 381157c8e208f2bb1823f084f2c1ee4b9194e45b Mon Sep 17 00:00:00 2001
From: Jared Roberts <jaredr@gmail.com>
Date: Mon, 10 Oct 2016 19:08:21 -0700
Subject: [PATCH] no all caps for enum variants

---
 src/bin/tileview.rs |  2 +-
 src/ega.rs          | 16 ++++++++--------
 src/scenes/world.rs | 14 +++++++-------
 src/tile.rs         |  2 +-
 src/town.rs         |  8 ++++----
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/bin/tileview.rs b/src/bin/tileview.rs
index 8c21a10..0dc4d1a 100644
--- a/src/bin/tileview.rs
+++ b/src/bin/tileview.rs
@@ -22,7 +22,7 @@ fn main() {
   let mut ega_vec = Vec::<u8>::new();
 
   file.read_to_end(&mut ega_vec).expect("Read EGA file");
-  let ega_page = ega::decode(&ega_vec, Compression::UNCOMPRESSED, Tiling::TILED(16));
+  let ega_page = ega::decode(&ega_vec, Compression::Uncompressed, Tiling::Tiled(16));
   for (i, tilepixels) in ega_page.iter().enumerate() {
     let out_name = format!("out/{}.png", i);
     let out_file = std::fs::File::create(Path::new(&out_name)).expect("open out file");
diff --git a/src/ega.rs b/src/ega.rs
index bd59539..d4041cf 100644
--- a/src/ega.rs
+++ b/src/ega.rs
@@ -16,14 +16,14 @@ static EGA_PALETTE: [[u8; 4]; 16] = [[0x00, 0x00, 0x00, 0x00],
                                      [0xFF, 0xFF, 0xFF, 0x00]];
 
 pub enum Compression {
-  UNCOMPRESSED,
-  RLE,
-  LZW
+  Uncompressed,
+  Rle,
+  Lzw
 }
 
 pub enum Tiling {
-  UNTILED,
-  TILED(u16)
+  Untiled,
+  Tiled(u16)
 }
 
 pub struct EgaPage {
@@ -98,7 +98,7 @@ pub fn decode<'a>(buf: &[u8], compression: Compression, tiling: Tiling)
   let out: Vec<u8>;
 
   out = match compression {
-    Compression::UNCOMPRESSED => buf.iter()
+    Compression::Uncompressed => buf.iter()
                                     .flat_map(|tile_byte| {
                                       EGA_PALETTE[(tile_byte >> 4u8 & 0xF) as usize]
                                         .into_iter()
@@ -110,8 +110,8 @@ pub fn decode<'a>(buf: &[u8], compression: Compression, tiling: Tiling)
     _ => unimplemented!()
   };
   let dim = match tiling {
-    Tiling::TILED(tiledim) => tiledim as usize,
-    Tiling::UNTILED => out.len()
+    Tiling::Tiled(tiledim) => tiledim as usize,
+    Tiling::Untiled => out.len()
   };
   EgaPage { data: out, dim: dim}
 }
diff --git a/src/scenes/world.rs b/src/scenes/world.rs
index af977d0..1886432 100644
--- a/src/scenes/world.rs
+++ b/src/scenes/world.rs
@@ -112,8 +112,8 @@ fn get_model(world: &model::World) -> (Vec<Vertex>, Vec<u32>) {
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 enum TrackMode {
-  TOUCH,
-  PRESS
+  Touch,
+  Press
 }
 
 pub struct WorldScene<D: gfx::Device,
@@ -185,13 +185,13 @@ impl<D: gfx::Device,
     use vr::Event::*;
     match event {
       Vr(Touch { dev_idx, .. }) => {
-        self.pads.insert(dev_idx, (TrackMode::TOUCH, None));
+        self.pads.insert(dev_idx, (TrackMode::Touch, None));
       },
       Vr(Press { dev_idx, .. }) => {
-        self.pads.insert(dev_idx, (TrackMode::PRESS, None));
+        self.pads.insert(dev_idx, (TrackMode::Press, None));
       },
       Vr(Unpress { dev_idx, .. }) => {
-        self.pads.insert(dev_idx, (TrackMode::TOUCH, None));
+        self.pads.insert(dev_idx, (TrackMode::Touch, None));
       },
       Vr(Untouch { dev_idx, .. }) => {
         self.pads.remove(&dev_idx);
@@ -213,7 +213,7 @@ impl<D: gfx::Device,
       if let Some(state) = vr.get_controller_state(*pad) {
         if let Some(old_state) = track.1 {
           match mode {
-            TrackMode::TOUCH => {
+            TrackMode::Touch => {
               const THRESHOLD: f32 = 0.005;
               const SCALE: f32 = 32.0;
               let xdiff = state.rAxis[0].x - old_state.rAxis[0].x;
@@ -221,7 +221,7 @@ impl<D: gfx::Device,
               if xdiff.abs() > THRESHOLD { self.treadmills.0 += SCALE * xdiff; }
               if ydiff.abs() > THRESHOLD { self.treadmills.1 += SCALE * ydiff; }
             },
-            TrackMode::PRESS => {
+            TrackMode::Press => {
               let rot = na::Vector3::new(0.0, 0.0, 0.0);
               let speed = R2 * 0.01;
               if state.rAxis[0].x > 0.5 {
diff --git a/src/tile.rs b/src/tile.rs
index b412fae..b50c2b0 100644
--- a/src/tile.rs
+++ b/src/tile.rs
@@ -29,7 +29,7 @@ pub fn get_tiles<D, F, T>(device: &mut D,
     .expect(&format!("failed opening tiles file: {}", filename));
   let mut ega_bytes = Vec::new();
   file.read_to_end(&mut ega_bytes).expect("Read tiles file");
-  let ega_page = ega::decode(&ega_bytes, ega::Compression::UNCOMPRESSED, ega::Tiling::TILED(TILEDIM));
+  let ega_page = ega::decode(&ega_bytes, ega::Compression::Uncompressed, ega::Tiling::Tiled(TILEDIM));
   let mipmap = ega_page.mipmap(2);
 
   let tex = factory.create_texture_const_u8::<T>(tex::Kind::D2Array(mipmap.dim as u16,
diff --git a/src/town.rs b/src/town.rs
index 58379db..db41dd0 100644
--- a/src/town.rs
+++ b/src/town.rs
@@ -6,10 +6,10 @@ use tile::Tile;
 #[allow(dead_code)]
 #[derive(Clone, Copy, Debug)]
 enum Behavior {
-  FIXED = 0x00,
-  WANDER = 0x01,
-  FOLLOW = 0x80,
-  ATTACK = 0xFF,
+  Fixed = 0x00,
+  Wander = 0x01,
+  Follow = 0x80,
+  Attack = 0xFF,
 }
 
 #[derive(Clone, Copy)]