Resolve merge problems #52

Author: mverleg

Diff for: dev/playground/src/hashin.rs renamed to dev/playground/src/hashing.rs

@@ -29,7 +29,6 @@ impl<H: 'static + Hasher> AnyHasher for H {
 	}
 }
 
-// TODO: but now I want this not for everything
 impl<T: 'static + Hash> MyTrait for T {
 	fn as_any(&self) -> &Any {
 		self as &Any
@@ -41,9 +40,6 @@ impl<T: 'static + Hash> MyTrait for T {
 	}
 }
 
-//impl MyTrait for A {}
-//impl MyTrait for B {}
-
 impl Hash for MyTrait {
 	fn hash<H: Hasher>(&self, hasher: &mut H) {
 		self.my_hash(hasher)
@@ -57,48 +53,3 @@ fn main() {
 	let x: &MyTrait = &A(1);
 	x.hash(&mut hasher);
 }
-
-
-//trait PreS: Debug {}
-//
-//trait HasherAsAny {
-//	fn as_any(&self) -> &Any;
-//}
-//
-//trait PostS {
-//	fn as_any(&self) -> &Any;
-//
-//	fn _hash<H: Hasher>(&self, hasher: H);
-//}
-//
-//impl<T: 'static + Hasher> HasherAsAny for T {
-//	fn as_any(&self) -> &Any {
-//		self as &Any
-//	}
-//}
-//
-//impl<T: 'static + PreS> PostS for T {
-//	fn as_any(&self) -> &Any {
-//		self as &Any
-//	}
-//
-//	fn _hash<H: Hasher>(&self, hasher: H) {
-//		self.as_any().downcast_ref::<T>().hash(hasher)
-//	}
-//}
-//
-//impl PreS for A {}
-//
-//impl PreS for B {}
-//
-//impl Hash for PostS {
-//	fn hash(&self, hasher: &mut HasherAsAny) {
-//		self._hash(hasher.as_any().downcast_ref::<T>())
-//	}
-//}
-//
-//fn main() {
-//	let x: &PostS = &A(1);
-//	let m = HashMap::new();
-//	m.insert(x, 0);
-//}

Diff for: src/lib.rs

@@ -1,6 +1,5 @@
 #![feature(nll)]
 //#![feature(generators, generator_trait)]
-
 #![feature(proc_macro, wasm_custom_section, wasm_import_module)]
 extern crate core;
 extern crate wasm_bindgen;
@@ -13,9 +12,7 @@ extern crate derive_new;
 
 pub mod mango {
     // Utilities
-    pub mod cli;
     pub mod io;
-
     pub mod jit;
     pub mod ui;
     pub mod util;