Merge pull request #323 from ethcore/warnings

Look ma no `dead_code`

ethcore/src/evm/factory.rs

@@ -1,29 +1,39 @@
 //! Evm factory.
 //!
 //! TODO: consider spliting it into two separate files.
+#[cfg(test)]
 use std::fmt;
 use evm::Evm;
 
 #[derive(Clone)]
 /// Type of EVM to use.
 pub enum VMType {
-	#[allow(dead_code)] // crated only by jit
 	/// JIT EVM
+	#[cfg(feature="jit")]
 	Jit,
 	/// RUST EVM
 	Interpreter
 }
 
+#[cfg(test)]
 impl fmt::Display for VMType {
+	#[cfg(feature="jit")]
 	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 		write!(f, "{}", match *self {
 			VMType::Jit => "JIT",
 			VMType::Interpreter => "INT"
 		})
 	}
+	#[cfg(not(feature="jit"))]
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		write!(f, "{}", match *self {
+			VMType::Interpreter => "INT"
+		})
+	}
 }
 
 #[cfg(test)]
+#[cfg(feature = "json-tests")]
 impl VMType {
 	/// Return all possible VMs (JIT, Interpreter)
 	#[cfg(feature="jit")]
@@ -45,10 +55,11 @@ pub struct Factory {
 
 impl Factory {
 	/// Create fresh instance of VM
+	#[cfg(feature="jit")]
 	pub fn create(&self) -> Box<Evm> {
 		match self.evm {
 			VMType::Jit => {
-				Factory::jit()
+				Box::new(super::jit::JitEvm)
 			},
 			VMType::Interpreter => {
 				Box::new(super::interpreter::Interpreter)
@@ -56,6 +67,16 @@ impl Factory {
 		}	
 	}
 
+	/// Create fresh instance of VM
+	#[cfg(not(feature="jit"))]
+	pub fn create(&self) -> Box<Evm> {
+		match self.evm {
+			VMType::Interpreter => {
+				Box::new(super::interpreter::Interpreter)
+			}
+		}	
+	}
+
 	/// Create new instance of specific `VMType` factory
 	#[cfg(test)]
 	pub fn new(evm: VMType) -> Factory {
@@ -63,16 +84,6 @@ impl Factory {
 			evm: evm
 		}
 	}
-
-	#[cfg(feature = "jit")]
-	fn jit() -> Box<Evm> {
-		Box::new(super::jit::JitEvm)
-	}
-
-	#[cfg(not(feature = "jit"))]
-	fn jit() -> Box<Evm> {
-		unimplemented!()
-	}
 }
 impl Default for Factory {
 	/// Returns jitvm factory

ethcore/src/evm/tests.rs

@@ -95,7 +95,7 @@ impl Ext for FakeExt {
 			value: Option<U256>,
 			data: &[u8], 
 			code_address: &Address, 
-			output: &mut [u8]) -> MessageCallResult {
+			_output: &mut [u8]) -> MessageCallResult {
 
 		self.calls.insert(FakeCall {
 			call_type: FakeCallType::CALL,