diff options
author | Chih-Hung Hsieh <chh@google.com> | 2020-10-26 20:46:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-26 20:46:44 +0000 |
commit | 3635defaa94660c9c81620870ec7ed563e8bd741 (patch) | |
tree | 1ec30db9364673fe7f34a432311e317876a0ced3 | |
parent | 36b32e37a1e4daa5960d5c47a255680bbbe436ae (diff) | |
parent | 91ff4c95d017ad9d3634b448ea889ec2c051e16a (diff) | |
download | futures-io-3635defaa94660c9c81620870ec7ed563e8bd741.tar.gz |
Upgrade rust/crates/futures-io to 0.3.7 am: 91ff4c95d0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-io/+/1473776
Change-Id: I33a71a47a088da919d45fa35e48c7157acc253b0
-rw-r--r-- | Cargo.toml | 5 | ||||
-rw-r--r-- | Cargo.toml.orig | 5 | ||||
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | src/lib.rs | 11 |
4 files changed, 20 insertions, 9 deletions
@@ -13,15 +13,16 @@ [package] edition = "2018" name = "futures-io" -version = "0.3.5" +version = "0.3.7" authors = ["Alex Crichton <alex@alexcrichton.com>"] description = "The `AsyncRead`, `AsyncWrite`, `AsyncSeek`, and `AsyncBufRead` traits for the futures-rs library.\n" homepage = "https://rust-lang.github.io/futures-rs" -documentation = "https://docs.rs/futures-io/0.3.5" +documentation = "https://docs.rs/futures-io/0.3.7" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/futures-rs" [package.metadata.docs.rs] all-features = true +rustdoc-args = ["--cfg", "docsrs"] [dependencies] diff --git a/Cargo.toml.orig b/Cargo.toml.orig index de0385d..40c659f 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,12 +1,12 @@ [package] name = "futures-io" edition = "2018" -version = "0.3.5" +version = "0.3.7" authors = ["Alex Crichton <alex@alexcrichton.com>"] license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/futures-rs" homepage = "https://rust-lang.github.io/futures-rs" -documentation = "https://docs.rs/futures-io/0.3.5" +documentation = "https://docs.rs/futures-io/0.3.7" description = """ The `AsyncRead`, `AsyncWrite`, `AsyncSeek`, and `AsyncBufRead` traits for the futures-rs library. """ @@ -25,3 +25,4 @@ read-initializer = [] [package.metadata.docs.rs] all-features = true +rustdoc-args = ["--cfg", "docsrs"] @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/futures-io/futures-io-0.3.5.crate" + value: "https://static.crates.io/crates/futures-io/futures-io-0.3.7.crate" } - version: "0.3.5" + version: "0.3.7" license_type: NOTICE last_upgrade_date { year: 2020 - month: 5 - day: 8 + month: 10 + day: 25 } } @@ -17,9 +17,16 @@ #![cfg_attr(test, warn(single_use_lifetimes))] #![warn(clippy::all)] +// mem::take requires Rust 1.40, matches! requires Rust 1.42 +// Can be removed if the minimum supported version increased or if https://github.com/rust-lang/rust-clippy/issues/3941 +// get's implemented. +#![allow(clippy::mem_replace_with_default, clippy::match_like_matches_macro)] + #![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))] -#![doc(html_root_url = "https://docs.rs/futures-io/0.3.5")] +#![doc(html_root_url = "https://docs.rs/futures-io/0.3.7")] + +#![cfg_attr(docsrs, feature(doc_cfg))] #[cfg(all(feature = "read-initializer", not(feature = "unstable")))] compile_error!("The `read-initializer` feature requires the `unstable` feature as an explicit opt-in to unstable features"); @@ -44,6 +51,7 @@ mod if_std { }; #[cfg(feature = "read-initializer")] + #[cfg_attr(docsrs, doc(cfg(feature = "read-initializer")))] #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411 pub use io::Initializer as Initializer; @@ -70,6 +78,7 @@ mod if_std { /// return a non-zeroing `Initializer` from another `AsyncRead` type /// without an `unsafe` block. #[cfg(feature = "read-initializer")] + #[cfg_attr(docsrs, doc(cfg(feature = "read-initializer")))] #[inline] unsafe fn initializer(&self) -> Initializer { Initializer::zeroing() |