Upgrade rust/crates/futures-io to 0.3.13 am: e89190cb18 am: 59b23b6dd1 am: 892a3c8dc4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-io/+/1662784
Change-Id: I791a204c73bca8dcc65810c193c0d3e7908a87b0
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 4fd4ba3..f3ad3ab 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "1d53a29ec16ccd5b094fb205edb73591455eb4b6"
+ "sha1": "c91f8691672c7401b1923ab00bf138975c99391a"
}
}
diff --git a/Android.bp b/Android.bp
index 89ef411..c4f884a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
// This file is generated by cargo2android.py --run --dependencies --device --tests --patch=patches/Android.bp.patch.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: ["external_rust_crates_futures-io_license"],
diff --git a/Cargo.toml b/Cargo.toml
index 6d0ce17..0cf53b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
[package]
edition = "2018"
name = "futures-io"
-version = "0.3.12"
+version = "0.3.13"
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"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index e90e9cb..2edbdc3 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
[package]
name = "futures-io"
edition = "2018"
-version = "0.3.12"
+version = "0.3.13"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
diff --git a/METADATA b/METADATA
index d0a9b4e..64097af 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/futures-io/futures-io-0.3.12.crate"
+ value: "https://static.crates.io/crates/futures-io/futures-io-0.3.13.crate"
}
- version: "0.3.12"
+ version: "0.3.13"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 2
- day: 9
+ month: 4
+ day: 1
}
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e884376..568eaf7 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,10 +2,58 @@
{
"presubmit": [
{
+ "name": "anyhow_device_test_tests_test_repr"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_context"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_convert"
+ },
+ {
"name": "futures-io_device_test_src_lib"
},
{
+ "name": "tokio-test_device_test_tests_block_on"
+ },
+ {
+ "name": "tokio-test_device_test_tests_io"
+ },
+ {
+ "name": "tokio-test_device_test_tests_macros"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_downcast"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_fmt"
+ },
+ {
"name": "futures-util_device_test_src_lib"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_autotrait"
+ },
+ {
+ "name": "anyhow_device_test_src_lib"
+ },
+ {
+ "name": "tokio-test_device_test_src_lib"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_source"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_ffi"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_macros"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_chain"
+ },
+ {
+ "name": "anyhow_device_test_tests_test_boxed"
}
]
}
diff --git a/src/lib.rs b/src/lib.rs
index 1468ea0..48de896 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -33,19 +33,13 @@
// Re-export some types from `std::io` so that users don't have to deal
// with conflicts when `use`ing `futures::io` and `std::io`.
#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
- pub use io::{
- Error as Error,
- ErrorKind as ErrorKind,
- Result as Result,
- IoSlice as IoSlice,
- IoSliceMut as IoSliceMut,
- SeekFrom as SeekFrom,
- };
-
+ #[doc(no_inline)]
+ pub use io::{Error, ErrorKind, Result, IoSlice, IoSliceMut, SeekFrom};
#[cfg(feature = "read-initializer")]
#[cfg_attr(docsrs, doc(cfg(feature = "read-initializer")))]
+ #[doc(no_inline)]
#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
- pub use io::Initializer as Initializer;
+ pub use io::Initializer;
/// Read bytes asynchronously.
///
