Merge pull request #467 from ethcore/ark_beta

Utils compiling in beta
openethereum · Feb 18, 2016 · 3c59983 · 3c59983
2 parents 704d6bd + af8ba06
commit 3c59983
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 196 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,6 @@ log = "0.3"
 env_logger = "0.3"
 rustc-serialize = "0.3"
 docopt = "0.6"
-docopt_macros = "0.6"
 ctrlc = { git = "https://github.com/tomusdrw/rust-ctrlc.git" }
 clippy = { version = "0.0.42", optional = true }
 ethcore-util = { path = "util" }

diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
@@ -15,8 +15,6 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 #![warn(missing_docs)]
-#![feature(cell_extras)]
-#![feature(augmented_assignments)]
 #![cfg_attr(feature="dev", feature(plugin))]
 #![cfg_attr(feature="dev", plugin(clippy))]
 // TODO [todr] not really sure

diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -6,9 +6,6 @@ name = "ethcore-util"
 version = "0.9.99"
 authors = ["Ethcore <admin@ethcore.io>"]
 
-[features]
-default = [ "heapsize/nightly" ]
-
 [dependencies]
 log = "0.3"
 env_logger = "0.3"
@@ -36,4 +33,4 @@ igd = "0.4.2"
 
 [features]
 default = []
-dev = ["clippy"]
+dev = ["clippy"]
diff --git a/util/src/hash.rs b/util/src/hash.rs
@@ -413,15 +413,6 @@ macro_rules! impl_hash {
 			}
 		}
 
-		/// Moving BitOrAssign
-		impl<'a> BitOrAssign<&'a $from> for $from {
-			fn bitor_assign(&mut self, rhs: &'a Self) {
-				for i in 0..$size {
-					self.0[i] = self.0[i] | rhs.0[i];
-				}
-			}
-		}
-
 		/// BitAnd on references
 		impl <'a> BitAnd for &'a $from {
 			type Output = $from;

diff --git a/util/src/lib.rs b/util/src/lib.rs
@@ -15,12 +15,8 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 #![warn(missing_docs)]
-#![feature(op_assign_traits)]
-#![feature(augmented_assignments)]
-#![feature(associated_consts)]
 #![cfg_attr(feature="dev", feature(plugin))]
 #![cfg_attr(feature="dev", plugin(clippy))]
-#![feature(catch_panic)]
 // Clippy settings
 // TODO [todr] not really sure
 #![allow(needless_range_loop)]