Skip to content

Commit 5d91489

Browse files
author
bors-servo
authored
Auto merge of #328 - emilio:publish, r=emilio
Publish r? @fitzgen
2 parents 68061dd + 854aa11 commit 5d91489

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ script:
3131
- git add -A
3232
- git diff @
3333
- git diff-index --quiet HEAD
34-
- cargo build --features "$BINDGEN_FEATURES _docs"
34+
- cargo build --features "$BINDGEN_FEATURES docs_"
3535
- cd tests/expectations
3636
- cargo test
3737
- cd ../../../bindgen

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[workspace]
22
members = [
3-
"bindgen",
4-
"libbindgen",
5-
"libbindgen/tests/expectations",
3+
"bindgen",
4+
"libbindgen",
5+
"libbindgen/tests/expectations",
66
]

libbindgen/Cargo.toml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ license = "BSD-3-Clause"
1212
name = "libbindgen"
1313
readme = "README.md"
1414
repository = "https://github.com/servo/rust-bindgen"
15-
version = "0.1.0"
15+
version = "0.1.1"
1616
workspace = ".."
1717

1818
[dev-dependencies]
@@ -37,10 +37,6 @@ cexpr = "0.2"
3737
features = ["with-syntex"]
3838
version = "0.34"
3939

40-
[dependencies.clippy]
41-
optional = true
42-
version = "*"
43-
4440
[dependencies.env_logger]
4541
optional = true
4642
version = "0.3"
@@ -59,4 +55,4 @@ llvm_stable = []
5955
logging = ["env_logger", "log"]
6056
static = []
6157
# This feature only exists for CI -- don't use it!
62-
_docs = []
58+
docs_ = []

libbindgen/src/lib.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
//!
66
//! See the [Builder](./struct.Builder.html) struct for usage.
77
8-
#![cfg_attr(feature = "clippy", feature(plugin))]
9-
#![cfg_attr(feature = "clippy", plugin(clippy))]
10-
118
#![deny(missing_docs)]
129
#![deny(warnings)]
1310

@@ -40,15 +37,15 @@ extern crate log;
4037
mod log_stubs;
4138

4239
// A macro to declare an internal module for which we *must* provide
43-
// documentation for. If we are building with the "_docs" feature, then the
40+
// documentation for. If we are building with the "docs_" feature, then the
4441
// module is declared public, and our `#![deny(missing_docs)]` pragma applies to
4542
// it. This feature is used in CI, so we won't let anything slip by
4643
// undocumented. Normal builds, however, will leave the module private, so that
4744
// we don't expose internals to library consumers.
4845
macro_rules! doc_mod {
4946
($m:ident, $doc_mod_name:ident) => {
5047
cfg_if! {
51-
if #[cfg(feature = "_docs")] {
48+
if #[cfg(feature = "docs_")] {
5249
pub mod $doc_mod_name {
5350
//! Autogenerated documentation module.
5451
pub use super::$m::*;
@@ -552,8 +549,6 @@ impl<'ctx> Bindings<'ctx> {
552549
}
553550

554551
/// Write these bindings as source text to the given `Write`able.
555-
// https://github.com/Manishearth/rust-clippy/issues/740
556-
#[cfg_attr(feature = "clippy", allow(needless_lifetimes))]
557552
pub fn write<'a>(&self, mut writer: Box<Write + 'a>) -> io::Result<()> {
558553
try!(writer.write("/* automatically generated by rust-bindgen */\n\n"
559554
.as_bytes()));

0 commit comments

Comments
 (0)