grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bump some of our core dependencies (#7563)

Browse Source 
* updated ethereum-types and tiny-keccak

* Updated several deps

* Updated several more dependencies

* Modify dummy file to trigger ci

* fixed update of memmap to 0.6 in ethash crate

* Fixed fetch after update to latest reqwest

* Updated jsonrpc-core with fixes for serde

* add expects in util/version/build.rs
This commit is contained in:
Marek Kotewicz
2018-01-17 11:45:29 +01:00
committed by GitHub
parent 7d49dd4727
commit 9adee532a0
21 changed files with 326 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/fetch/Cargo.toml
View File

@@ -11,7 +11,7 @@ futures = "0.1"
futures-cpupool = "0.1"
parking_lot = "0.4"
log = "0.3"
reqwest = "0.7"
reqwest = "0.8"
[features]
default = []

4
util/fetch/src/client.rs
View File

@@ -114,7 +114,7 @@ impl Clone for Client {
impl Client {
fn new_client() -> Result<Arc<reqwest::Client>, Error> {
let mut client = reqwest::ClientBuilder::new()?;
let mut client = reqwest::ClientBuilder::new();
client.redirect(reqwest::RedirectPolicy::limited(5));
Ok(Arc::new(client.build()?))
}
@@ -208,7 +208,7 @@ impl Future for FetchTask {
}
trace!(target: "fetch", "Starting fetch task: {:?}", self.url);
let result = self.client.get(&self.url)?
let result = self.client.get(&self.url)
.header(reqwest::header::UserAgent::new("Parity Fetch"))
.send()?;

2
util/network/Cargo.toml
View File

@@ -18,7 +18,7 @@ slab = "0.2"
igd = "0.6"
libc = "0.2.7"
parking_lot = "0.4"
ansi_term = "0.9"
ansi_term = "0.10"
rustc-hex = "1.0"
ethcore-io = { path = "../io" }
ethcore-bytes = { path = "../bytes" }

2
util/rlp/Cargo.toml
View File

@@ -9,6 +9,6 @@ authors = ["Parity Technologies <admin@parity.io>"]
[dependencies]
elastic-array = "0.9"
ethereum-types = "0.1"
lazy_static = "0.2"
lazy_static = "1.0"
rustc-hex = "1.0"
byteorder = "1.0"

2
util/version/Cargo.toml
View File

@@ -12,7 +12,7 @@ target_info = "0.1"
[build-dependencies]
vergen = "0.1"
rustc_version = "0.1.0"
rustc_version = "0.2.0"
[features]
final = []

10
util/version/build.rs
View File

@@ -23,15 +23,17 @@ use std::io::Write;
use std::path::Path;
use vergen::{vergen, OutputFns};
const ERROR_MSG: &'static str = "Failed to generate rustc_version file";
fn main() {
vergen(OutputFns::all()).unwrap();
let out_dir = env::var("OUT_DIR").unwrap();
vergen(OutputFns::all()).expect(ERROR_MSG);
let out_dir = env::var("OUT_DIR").expect(ERROR_MSG);
let dest_path = Path::new(&out_dir).join("rustc_version.rs");
let mut f = File::create(&dest_path).unwrap();
let mut f = File::create(&dest_path).expect(ERROR_MSG);
f.write_all(format!("
/// Returns compiler version.
pub fn rustc_version() -> &'static str {{
\"{}\"
}}
", rustc_version::version()).as_bytes()).unwrap();
", rustc_version::version().expect(ERROR_MSG)).as_bytes()).expect(ERROR_MSG);
}