diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-12-09 19:28:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-09 19:28:45 -0800 |
| commit | 5d914893b855f3d8a32cfffeda392cf8229ba5c9 (patch) | |
| tree | 5ebec611afd5b8fc078c8d46990f94d5f2aa1209 | |
| parent | 68061ddc596e6edddc2207dbfe7dcb7c083d9386 (diff) | |
| parent | 854aa11d237ff75474dc6c26833fcde884fdecd6 (diff) | |
Auto merge of #328 - emilio:publish, r=emilio
Publish
r? @fitzgen
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Cargo.toml | 6 | ||||
| -rw-r--r-- | libbindgen/Cargo.toml | 8 | ||||
| -rw-r--r-- | libbindgen/src/lib.rs | 9 |
4 files changed, 8 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 5882493b..8d7047aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ script: - git add -A - git diff @ - git diff-index --quiet HEAD - - cargo build --features "$BINDGEN_FEATURES _docs" + - cargo build --features "$BINDGEN_FEATURES docs_" - cd tests/expectations - cargo test - cd ../../../bindgen @@ -1,6 +1,6 @@ [workspace] members = [ - "bindgen", - "libbindgen", - "libbindgen/tests/expectations", + "bindgen", + "libbindgen", + "libbindgen/tests/expectations", ] diff --git a/libbindgen/Cargo.toml b/libbindgen/Cargo.toml index bc3137db..8d050a96 100644 --- a/libbindgen/Cargo.toml +++ b/libbindgen/Cargo.toml @@ -12,7 +12,7 @@ license = "BSD-3-Clause" name = "libbindgen" readme = "README.md" repository = "https://github.com/servo/rust-bindgen" -version = "0.1.0" +version = "0.1.1" workspace = ".." [dev-dependencies] @@ -37,10 +37,6 @@ cexpr = "0.2" features = ["with-syntex"] version = "0.34" -[dependencies.clippy] -optional = true -version = "*" - [dependencies.env_logger] optional = true version = "0.3" @@ -59,4 +55,4 @@ llvm_stable = [] logging = ["env_logger", "log"] static = [] # This feature only exists for CI -- don't use it! -_docs = [] +docs_ = [] diff --git a/libbindgen/src/lib.rs b/libbindgen/src/lib.rs index b2d3593c..7db26eab 100644 --- a/libbindgen/src/lib.rs +++ b/libbindgen/src/lib.rs @@ -5,9 +5,6 @@ //! //! See the [Builder](./struct.Builder.html) struct for usage. -#![cfg_attr(feature = "clippy", feature(plugin))] -#![cfg_attr(feature = "clippy", plugin(clippy))] - #![deny(missing_docs)] #![deny(warnings)] @@ -40,7 +37,7 @@ extern crate log; mod log_stubs; // A macro to declare an internal module for which we *must* provide -// documentation for. If we are building with the "_docs" feature, then the +// documentation for. If we are building with the "docs_" feature, then the // module is declared public, and our `#![deny(missing_docs)]` pragma applies to // it. This feature is used in CI, so we won't let anything slip by // undocumented. Normal builds, however, will leave the module private, so that @@ -48,7 +45,7 @@ mod log_stubs; macro_rules! doc_mod { ($m:ident, $doc_mod_name:ident) => { cfg_if! { - if #[cfg(feature = "_docs")] { + if #[cfg(feature = "docs_")] { pub mod $doc_mod_name { //! Autogenerated documentation module. pub use super::$m::*; @@ -552,8 +549,6 @@ impl<'ctx> Bindings<'ctx> { } /// Write these bindings as source text to the given `Write`able. - // https://github.com/Manishearth/rust-clippy/issues/740 - #[cfg_attr(feature = "clippy", allow(needless_lifetimes))] pub fn write<'a>(&self, mut writer: Box<Write + 'a>) -> io::Result<()> { try!(writer.write("/* automatically generated by rust-bindgen */\n\n" .as_bytes())); |