Minor changes to compile on master.

brson · Aug 18, 2013 · c4d7c08 · c4d7c08
1 parent 5ef1575
commit c4d7c08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/model.rs b/model.rs
@@ -28,8 +28,8 @@ pub struct kd_tree {
 }
 
 pub enum kd_tree_node {
-    pub leaf( u32, u32 ),
-    pub node( axis, f32, u32 )
+    leaf( u32, u32 ),
+    node( axis, f32, u32 )
 }
 
 fn find_split_plane( distances: &[f32], indices: &[uint], faces: &[uint] ) -> f32 {
@@ -259,7 +259,6 @@ fn parse_faceindex(s: &str) ->  uint {
 }
 
 fn read_polysoup(fname: &str) -> polysoup {
-    use std::iterator::IteratorUtil;
     let reader = io::file_reader( &Path(fname) ).unwrap();
     let mut vertices = ~[];
     let mut indices = ~[];

diff --git a/raytracer.rs b/raytracer.rs
@@ -690,7 +690,7 @@ pub fn generate_raytraced_image_multi(
         };
         results.push(workers[i % num_tasks].calculate(ttd,tracetask));
     }
-    let mut fmap = results.consume_iter().flat_map_(|f| f.unwrap().consume_iter() );
+    let mut fmap = results.move_iter().flat_map(|f| f.unwrap().move_iter() );
     fmap.collect()
 }