Merge remote-tracking branch 'tpt/master'

Conflicts:
	src/objects/mod.rs
	src/processor/instructions.rs
	src/processor/mod.rs

Author: progval

.gitignore

@@ -2,3 +2,4 @@ target
 Cargo.lock
 *.swp
 *~
+*.iml

src/objects/mod.rs

@@ -1,5 +1,5 @@
 use std::collections::HashMap;
-use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
 
 #[derive(Debug)]
 #[derive(Clone)]
@@ -52,7 +52,7 @@ pub struct ObjectRef {
     id: usize,
 }
 
-static current_ref_id: AtomicUsize = ::std::sync::atomic::ATOMIC_USIZE_INIT;
+static CURRENT_REF_ID: AtomicUsize = ATOMIC_USIZE_INIT;
 
 #[derive(Debug)]
 pub struct ObjectStore {
@@ -65,7 +65,7 @@ impl ObjectStore {
     }
 
     pub fn allocate(&mut self, obj: ObjectContent) -> ObjectRef {
-        let obj_ref = ObjectRef { id: current_ref_id.fetch_add(1, Ordering::SeqCst) };
+        let obj_ref = ObjectRef { id: CURRENT_REF_ID.fetch_add(1, Ordering::SeqCst) };
         self.all_objects.insert(obj_ref.clone(), Object { content: obj });
         obj_ref
     }

src/processor/mod.rs

@@ -86,7 +86,7 @@ impl<EP: EnvProxy> Processor<EP> {
         let instructions: Vec<Instruction> = instructions::InstructionDecoder::new(bytecode.iter()).into_iter().collect();
         let mut program_counter = 0 as usize;
         let mut stack = VectorStack::new();
-        while true {
+        loop {
             let instruction = try!(instructions.get(program_counter).ok_or(ProcessorError::InvalidProgramCounter));
             program_counter += 1;
             match *instruction {

src/sandbox/mod.rs

@@ -10,12 +10,11 @@ pub trait EnvProxy {
 
 
 /// An EnvProxy that exposes the real environment
-pub struct RealEnvProxy {
-}
+pub struct RealEnvProxy;
 
 impl RealEnvProxy {
     pub fn new() -> RealEnvProxy {
-        RealEnvProxy { }
+        RealEnvProxy
     }
 }