Commiting a bugged version for error reporting to rust

Author: Daniel Griffen

src/main.rs

@@ -1,4 +1,4 @@
-#![feature(globs)]
+#![feature(globs, associated_types)]
 
 extern crate graphics;
 extern crate sdl2_window;
@@ -18,17 +18,13 @@ use event::{
     WindowSettings
 };
 
-use event::window::Size;
-
-use current::{Set, Get};
-
+use current::Set;
 use sdl2_window::Sdl2Window;
 use opengl_graphics::Gl;
-
 use engine::ConwayEngine;
 use world::World;
-
 use std::cell::RefCell;
+
 pub mod cell;
 pub mod world;
 pub mod engine;

src/world.rs

@@ -8,7 +8,13 @@ pub struct HashWorld {
     pub cells: HashMap<(int, int), State>
 }
 
+/*struct HashWorldIter {
+    iter: hash_map::Entries<(int, int), State + 'static>
+}*/
+
 pub trait World {
+    type WorldIter: Iterator<((int, int), State)>;
+
     fn get_cell(&self, x: int, y: int) -> State;
 
     fn set_cell(&mut self, x: int, y: int);
@@ -34,16 +40,30 @@ pub trait World {
     ///This will stay in this format for the forseeable future.
     ///Returning a generic iterator adds too much overhead to the
     ///iter() function
-    fn iter(&self) -> hash_map::Entries<(int, int), State>;
+    fn iter(&self) -> World::WorldIter;
+}
+
+
+/*impl HashWorldIter {
+    fn new(iter: hash_map::Entries<(int, int), State>) -> HashWorldIter {
+        HashWorldIter { iter: iter }
+    }
 }
 
+impl Iterator<((int, int), State)> for HashWorldIter {
+    fn next(&mut self) -> ((int, int), State) {
+        self.iter.next()
+    }
+}*/
+
 impl HashWorld {
     pub fn new() -> HashWorld {
         HashWorld { cells: HashMap::new() }
     }
 }
 
 impl World for HashWorld {
+    type WorldIter = hash_map::Entries<(int, int), State>;
 
     fn get_cell(&self, x: int, y: int) -> State {
         match self.cells.get(&(x, y)) {