Updates for new rustc

api/src/lib.rs

@@ -1,5 +1,3 @@
-#![feature(use_extern_macros)]
-
 extern crate protobuf;
 extern crate serde;
 

benchmark/src/main.rs

@@ -1,5 +1,3 @@
-#![feature(use_extern_macros)]
-
 #[macro_use]
 extern crate clap;
 use clap::{App, Arg};

gateway/bin/main.rs

@@ -16,8 +16,6 @@
 
 //! web3 gateway for Oasis Ethereum runtime.
 
-#![feature(use_extern_macros)]
-
 extern crate ctrlc;
 extern crate fdlimit;
 extern crate log;

gateway/src/lib.rs

@@ -16,8 +16,6 @@
 
 //! Ethcore client application.
 
-#![feature(use_extern_macros)]
-
 #[macro_use]
 extern crate clap;
 extern crate env_logger;

gateway/src/state.rs

@@ -1,6 +1,7 @@
 //! Read-only interface to blockchain and account state, backed by an Ekiden Database.
 
 use std::marker::{Send, Sync};
+use std::mem;
 use std::sync::Arc;
 
 use common_types::log_entry::{LocalizedLogEntry, LogEntry};
@@ -257,12 +258,16 @@ where
     }
 }
 
+pub fn to_bytes(num: u32) -> [u8; mem::size_of::<u32>()] {
+    unsafe { mem::transmute(num) }
+}
+
 // Parity expects the database to namespace keys by column. The Ekiden db
 // doesn't [yet?] have this feature, so we emulate by prepending the column id
 // to the actual key. Columns None and 0 should be distinct, so we use prefix 0
 // for None and col+1 for Some(col).
 pub fn get_key(col: Option<u32>, key: &[u8]) -> Vec<u8> {
-    let col_bytes = col.map(|id| (id + 1).to_le().to_bytes())
+    let col_bytes = col.map(|id| to_bytes((id + 1).to_le()))
         .unwrap_or([0, 0, 0, 0]);
     col_bytes
         .into_iter()

genesis/src/main.rs

@@ -1,4 +1,3 @@
-#![feature(use_extern_macros)]
 use std::collections::HashMap;
 use std::str::FromStr;
 

playback/src/main.rs

@@ -1,5 +1,3 @@
-#![feature(use_extern_macros)]
-
 extern crate ethereum_types;
 #[macro_use]
 extern crate clap;

src/lib.rs

@@ -1,6 +1,3 @@
-#![feature(iterator_try_fold)]
-#![feature(use_extern_macros)]
-
 extern crate common_types as ethcore_types;
 extern crate ekiden_common;
 extern crate ekiden_core;

src/state.rs

@@ -1,4 +1,5 @@
 use std::{collections::HashSet,
+          mem,
           ops::Deref,
           sync::{Arc, Mutex}};
 
@@ -368,12 +369,16 @@ fn to_block_id(id: EkidenBlockId) -> BlockId {
     }
 }
 
+pub fn to_bytes(num: u32) -> [u8; mem::size_of::<u32>()] {
+    unsafe { mem::transmute(num) }
+}
+
 // Parity expects the database to namespace keys by column. The Ekiden db
 // doesn't [yet?] have this feature, so we emulate by prepending the column id
 // to the actual key. Columns None and 0 should be distinct, so we use prefix 0
 // for None and col+1 for Some(col).
 fn get_key(col: Option<u32>, key: &[u8]) -> Vec<u8> {
-    let col_bytes = col.map(|id| (id + 1).to_le().to_bytes())
+    let col_bytes = col.map(|id| to_bytes((id + 1).to_le()))
         .unwrap_or([0, 0, 0, 0]);
     col_bytes
         .into_iter()