Skip to content
This repository has been archived by the owner on Oct 22, 2023. It is now read-only.

Update runtime to use new rustc #199

Merged
merged 4 commits into from
Sep 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions api/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(use_extern_macros)]

extern crate protobuf;
extern crate serde;

Expand Down
2 changes: 0 additions & 2 deletions benchmark/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(use_extern_macros)]

#[macro_use]
extern crate clap;
use clap::{App, Arg};
Expand Down
2 changes: 0 additions & 2 deletions gateway/bin/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

//! web3 gateway for Oasis Ethereum runtime.

#![feature(use_extern_macros)]

extern crate ctrlc;
extern crate fdlimit;
extern crate log;
Expand Down
2 changes: 1 addition & 1 deletion gateway/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

//! Ethcore client application.

#![feature(use_extern_macros)]
#![feature(int_to_from_bytes)]

#[macro_use]
extern crate clap;
Expand Down
3 changes: 1 addition & 2 deletions gateway/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,7 @@ where
// 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())
.unwrap_or([0, 0, 0, 0]);
let col_bytes = col.map(|id| (id + 1).to_le_bytes()).unwrap_or([0, 0, 0, 0]);
col_bytes
.into_iter()
.chain(key.into_iter())
Expand Down
1 change: 0 additions & 1 deletion genesis/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![feature(use_extern_macros)]
use std::collections::HashMap;
use std::str::FromStr;

Expand Down
2 changes: 0 additions & 2 deletions playback/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(use_extern_macros)]

extern crate ethereum_types;
#[macro_use]
extern crate clap;
Expand Down
3 changes: 1 addition & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#![feature(iterator_try_fold)]
#![feature(use_extern_macros)]
#![feature(int_to_from_bytes)]

extern crate common_types as ethcore_types;
extern crate ekiden_common;
Expand Down
3 changes: 1 addition & 2 deletions src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,7 @@ fn to_block_id(id: EkidenBlockId) -> BlockId {
// 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())
.unwrap_or([0, 0, 0, 0]);
let col_bytes = col.map(|id| (id + 1).to_le_bytes()).unwrap_or([0, 0, 0, 0]);
col_bytes
.into_iter()
.chain(key.into_iter())
Expand Down
Loading