Merge pull request #421 from paritytech/depsup

updated dependencies and removed primitives build.rs
This commit is contained in:
Marek Kotewicz 2017-07-21 14:56:48 +02:00 committed by GitHub
commit a2757b00ea
5 changed files with 246 additions and 223 deletions

436
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -2,13 +2,9 @@
name = "primitives"
version = "0.1.0"
authors = ["debris <marek.kotewicz@gmail.com>"]
build = "build.rs"
[dependencies]
heapsize = "0.3"
rustc-serialize = "0.3"
byteorder = "1.0"
bigint = "1.0"
[build-dependencies]
rustc_version = "0.1"

View File

@ -1,25 +0,0 @@
// Copyright 2015, 2016 Ethcore (UK) Ltd.
// This file is part of Parity.
// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
extern crate rustc_version;
use rustc_version::{version_meta, Channel};
fn main() {
if let Channel::Nightly = version_meta().channel {
println!("cargo:rustc-cfg=asm_available");
}
}

View File

@ -1,5 +1,3 @@
#![cfg_attr(asm_available, feature(asm))]
extern crate byteorder;
#[macro_use]
extern crate heapsize;

View File

@ -6,7 +6,7 @@ authors = ["Nikolay Volf <nikvolf@gmail.com>"]
[dependencies]
time = "0.1"
log = "0.3"
rayon = "0.6"
rayon = "0.7"
parking_lot = "0.4"
primitives = { path = "../primitives" }
chain = { path = "../chain" }