Merge remote-tracking branch 'tpt/master'

progval · progval · commit efed6a3cd13d · 2016-04-13T18:02:30.000+02:00
Conflicts:
	src/objects/mod.rs
	src/processor/instructions.rs
	src/processor/mod.rs
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ target
 Cargo.lock
 *.swp
 *~
+*.iml
diff --git a/src/objects/mod.rs b/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
     }
diff --git a/src/processor/mod.rs b/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 {
diff --git a/src/sandbox/mod.rs b/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
     }
 }
 

-Original file line number
+Diff line change
 Cargo.lock
 *.swp
 *~
 +*.iml
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`use std::collections::HashMap;`
`2`		`-use std::sync::atomic::{AtomicUsize, Ordering};`
	`2`	`+use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};`
`3`	`3`
`4`	`4`	`#[derive(Debug)]`
`5`	`5`	`#[derive(Clone)]`
`@@ -52,7 +52,7 @@ pub struct ObjectRef {`
`52`	`52`	`id: usize,`
`53`	`53`	`}`
`54`	`54`
`55`		`-static current_ref_id: AtomicUsize = ::std::sync::atomic::ATOMIC_USIZE_INIT;`
	`55`	`+static CURRENT_REF_ID: AtomicUsize = ATOMIC_USIZE_INIT;`
`56`	`56`
`57`	`57`	`#[derive(Debug)]`
`58`	`58`	`pub struct ObjectStore {`
`@@ -65,7 +65,7 @@ impl ObjectStore {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`pub fn allocate(&mut self, obj: ObjectContent) -> ObjectRef {`
`68`		`- let obj_ref = ObjectRef { id: current_ref_id.fetch_add(1, Ordering::SeqCst) };`
	`68`	`+ let obj_ref = ObjectRef { id: CURRENT_REF_ID.fetch_add(1, Ordering::SeqCst) };`
`69`	`69`	`self.all_objects.insert(obj_ref.clone(), Object { content: obj });`
`70`	`70`	`obj_ref`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,11 @@ pub trait EnvProxy {`
`10`	`10`
`11`	`11`
`12`	`12`	`/// An EnvProxy that exposes the real environment`
`13`		`-pub struct RealEnvProxy {`
`14`		`-}`
	`13`	`+pub struct RealEnvProxy;`
`15`	`14`
`16`	`15`	`impl RealEnvProxy {`
`17`	`16`	`pub fn new() -> RealEnvProxy {`
`18`		`- RealEnvProxy { }`
	`17`	`+ RealEnvProxy`
`19`	`18`	`}`
`20`	`19`	`}`
`21`	`20`