Skip to content

Commit

Permalink
rust 2018 paths everywhere
Browse files Browse the repository at this point in the history
  • Loading branch information
konstin committed Dec 28, 2018
1 parent 22226ea commit 96b0187
Show file tree
Hide file tree
Showing 24 changed files with 117 additions and 370 deletions.
44 changes: 6 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 3 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,16 @@ failure = "0.1.3"
keyring = { version = "0.6.1", optional = true }
reqwest = { version = "0.9.5", optional = true }
rpassword = "2.1.0"
serde_derive = "1.0.81"
serde_json = "1.0.33"
sha2 = "0.8.0"
structopt = "0.2.13"
structopt = "0.2.14"
target_info = "0.1.0"
toml = "0.4.10"
zip = "0.5.0"
serde = "1.0.81"
tar = { version = "0.4.20", optional = true }
libflate = { version = "0.1.19", optional = true }
serde = { version = "1.0.82", features = ["derive"] }
human-panic = { version = "1.0.1", optional = true }
regex = "1.1.0"
indicatif = "0.10.3"
indicatif = "0.11.0"
atty = "0.2.11"
tempfile = "3.0.5"
goblin = { version = "0.0.19", optional = true }
Expand All @@ -63,9 +60,6 @@ log = ["pretty_env_logger"]
# This will make rewquest use a statically linked version of openssl
musl = ["openssl"]

# sdists can be created, but they are currently useless (#2)
sdist = ["tar", "libflate"]

[workspace]
members = [
"get-fourtytwo",
Expand Down
5 changes: 2 additions & 3 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ For pyo3 and rust-cpython, pyo3-pack can only build packages for installed pytho

Cffi wheels are compatible with all python versions, but they need to have `cffi` installed for the python used for building (`pip install cffi`).

Until [eqrion/cbdingen#203](https://github.com/eqrion/cbindgen/issues/203) is resolved, you also need cbindgen 0.6.4 as build dependency and a build script that writes c headers to a file called `target/header.h`:
Until [eqrion/cbdingen#203](https://github.com/eqrion/cbindgen/issues/203) is resolved, you also need cbindgen 0.6.4 as build dependency and a build script that writes c headers to a file called `target/header.h` (use `extern crate cbindgen` for rust 2015 Crates):

```rust
extern crate cbindgen;

use cbindgen;
use std::env;
use std::path::Path;

Expand Down
Loading

0 comments on commit 96b0187

Please sign in to comment.