Skip to content

Commit ab6117c

Browse files
author
bors-servo
authored
Auto merge of #414 - emilio:crates-io, r=fitzgen,Yamakaky
Reorganize the crate and rename to bindgen. Fixes #398 Fixes #21 r? @fitzgen
2 parents 7373a42 + aad93a8 commit ab6117c

File tree

381 files changed

+93
-129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

381 files changed

+93
-129
lines changed

.travis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ cache:
2323

2424
before_install: . ./ci/before_install.sh
2525

26-
before_script: cd libbindgen
27-
2826
script:
2927
- cargo test --features "$BINDGEN_FEATURES assert_no_dangling_items"
3028
- cargo test --release --features "$BINDGEN_FEATURES assert_no_dangling_items"
@@ -34,10 +32,7 @@ script:
3432
- cargo build --features "$BINDGEN_FEATURES docs_"
3533
- cd tests/expectations
3634
- cargo test
37-
- cd ../../../bindgen
38-
- cargo test --features "$BINDGEN_FEATURES"
39-
- cargo test --release --features "$BINDGEN_FEATURES"
40-
- cd ../bindgen-integration
35+
- cd ../../bindgen-integration
4136
- cargo test --features "$BINDGEN_FEATURES"
4237
- cargo test --release --features "$BINDGEN_FEATURES"
4338

CONTRIBUTING.md

Lines changed: 11 additions & 13 deletions

Cargo.toml

Lines changed: 65 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,66 @@
1-
[workspace]
2-
members = [
3-
"bindgen",
4-
"bindgen-integration",
5-
"libbindgen",
6-
"libbindgen/tests/expectations",
1+
[package]
2+
authors = [
3+
"Jyun-Yan You <[email protected]>",
4+
"Emilio Cobos Álvarez <[email protected]>",
5+
"The Servo project developers",
76
]
7+
description = "A binding generator for Rust"
8+
homepage = "https://github.com/servo/rust-bindgen"
9+
keywords = ["bindings", "ffi", "code-generation"]
10+
license = "BSD-3-Clause"
11+
name = "bindgen"
12+
readme = "README.md"
13+
repository = "https://github.com/servo/rust-bindgen"
14+
version = "0.20.0"
15+
build = "build.rs"
16+
17+
[lib]
18+
path = "src/lib.rs"
19+
20+
[[bin]]
21+
name = "bindgen"
22+
path = "src/main.rs"
23+
24+
[dev-dependencies]
25+
diff = "0.1"
26+
clap = "2"
27+
shlex = "0.1"
28+
29+
[build-dependencies]
30+
quasi_codegen = "0.26"
31+
32+
[dependencies]
33+
cexpr = "0.2"
34+
cfg-if = "0.1.0"
35+
clang-sys = { version = "0.12", features = ["runtime", "clang_3_9"] }
36+
lazy_static = "0.2.1"
37+
rustc-serialize = "0.3.19"
38+
syntex_syntax = "0.54"
39+
regex = "0.2"
40+
# This kinda sucks: https://github.com/rust-lang/cargo/issues/1982
41+
clap = "2"
42+
43+
[dependencies.aster]
44+
features = ["with-syntex"]
45+
version = "0.38"
46+
47+
[dependencies.env_logger]
48+
optional = true
49+
version = "0.4"
50+
51+
[dependencies.log]
52+
optional = true
53+
version = "0.3"
54+
55+
[dependencies.quasi]
56+
features = ["with-syntex"]
57+
version = "0.29"
58+
59+
[features]
60+
assert_no_dangling_items = []
61+
default = ["logging"]
62+
llvm_stable = []
63+
logging = ["env_logger", "log"]
64+
static = []
65+
# This feature only exists for CI -- don't use it!
66+
docs_ = []

README.md

Lines changed: 3 additions & 3 deletions

bindgen-integration/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ name = "bindgen-integration"
33
description = "A package to test various bindgen features"
44
version = "0.1.0"
55
authors = ["Emilio Cobos Álvarez <[email protected]>"]
6-
workspace = ".."
76
publish = false
87
build = "build.rs"
98

109
[build-dependencies]
11-
libbindgen = { path = "../libbindgen" }
10+
bindgen = { path = ".." }
1211
gcc = "0.3"
1312

1413
[features]
15-
llvm_stable = ["libbindgen/llvm_stable"]
14+
llvm_stable = ["bindgen/llvm_stable"]

bindgen-integration/build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
extern crate libbindgen;
1+
extern crate bindgen;
22
extern crate gcc;
33

44
use std::env;
55
use std::path::PathBuf;
6-
use libbindgen::Builder;
6+
use bindgen::Builder;
77

88
fn main() {
99
gcc::Config::new()

bindgen/Cargo.toml

Lines changed: 0 additions & 26 deletions
This file was deleted.
File renamed without changes.

libbindgen/Cargo.toml

Lines changed: 0 additions & 58 deletions
This file was deleted.

libbindgen/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)