Merge "Upgrade futures-test to 0.3.25" am: 8fda920158
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-test/+/2337909
Change-Id: I51a2ba82a5f766fe7e14622dacd166c1ec5dda34
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 77d8405..9948f93 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "fc1e3250219170e31cddb8857a276cba7dd08d44"
+ "sha1": "77d82198c5afd04af3e760a6aa50b7e875289fc3"
},
"path_in_vcs": "futures-test"
}
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 6e57371..76e4409 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
-
-
package {
default_applicable_licenses: ["external_rust_crates_futures-test_license"],
}
@@ -44,7 +42,7 @@
host_supported: true,
crate_name: "futures_test",
cargo_env_compat: true,
- cargo_pkg_version: "0.3.21",
+ cargo_pkg_version: "0.3.25",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -57,7 +55,6 @@
"std",
],
rustlibs: [
- "libfutures",
"libfutures_core",
"libfutures_executor",
"libfutures_io",
@@ -75,7 +72,7 @@
host_supported: true,
crate_name: "futures_test",
cargo_env_compat: true,
- cargo_pkg_version: "0.3.21",
+ cargo_pkg_version: "0.3.25",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -93,4 +90,8 @@
"libpin_utils",
],
proc_macros: ["libfutures_macro"],
+ apex_available: [
+ "//apex_available:platform",
+ "//apex_available:anyapex",
+ ],
}
diff --git a/Cargo.toml b/Cargo.toml
index 41e5541..e623dae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,11 +13,12 @@
edition = "2018"
rust-version = "1.45"
name = "futures-test"
-version = "0.3.21"
+version = "0.3.25"
description = """
Common utilities for testing components built off futures-rs.
"""
homepage = "https://rust-lang.github.io/futures-rs"
+readme = "README.md"
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
@@ -25,35 +26,35 @@
all-features = true
[dependencies.futures-core]
-version = "0.3.21"
+version = "0.3.25"
default-features = false
[dependencies.futures-executor]
-version = "0.3.21"
+version = "0.3.25"
default-features = false
[dependencies.futures-io]
-version = "0.3.21"
+version = "0.3.25"
default-features = false
[dependencies.futures-macro]
-version = "=0.3.21"
+version = "=0.3.25"
default-features = false
[dependencies.futures-sink]
-version = "0.3.21"
+version = "0.3.25"
default-features = false
[dependencies.futures-task]
-version = "0.3.21"
+version = "0.3.25"
default-features = false
[dependencies.futures-util]
-version = "0.3.21"
+version = "0.3.25"
default-features = false
[dependencies.pin-project]
-version = "1.0.1"
+version = "1.0.11"
[dependencies.pin-utils]
version = "0.1.0"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index b5aa8a7..bd9fd22 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "futures-test"
-version = "0.3.21"
+version = "0.3.25"
edition = "2018"
rust-version = "1.45"
license = "MIT OR Apache-2.0"
@@ -11,15 +11,15 @@
"""
[dependencies]
-futures-core = { version = "0.3.21", path = "../futures-core", default-features = false }
-futures-task = { version = "0.3.21", path = "../futures-task", default-features = false }
-futures-io = { version = "0.3.21", path = "../futures-io", default-features = false }
-futures-util = { version = "0.3.21", path = "../futures-util", default-features = false }
-futures-executor = { version = "0.3.21", path = "../futures-executor", default-features = false }
-futures-sink = { version = "0.3.21", path = "../futures-sink", default-features = false }
-futures-macro = { version = "=0.3.21", path = "../futures-macro", default-features = false }
+futures-core = { version = "0.3.25", path = "../futures-core", default-features = false }
+futures-task = { version = "0.3.25", path = "../futures-task", default-features = false }
+futures-io = { version = "0.3.25", path = "../futures-io", default-features = false }
+futures-util = { version = "0.3.25", path = "../futures-util", default-features = false }
+futures-executor = { version = "0.3.25", path = "../futures-executor", default-features = false }
+futures-sink = { version = "0.3.25", path = "../futures-sink", default-features = false }
+futures-macro = { version = "=0.3.25", path = "../futures-macro", default-features = false }
pin-utils = { version = "0.1.0", default-features = false }
-pin-project = "1.0.1"
+pin-project = "1.0.11"
[dev-dependencies]
futures = { path = "../futures", default-features = false, features = ["std", "executor"] }
diff --git a/METADATA b/METADATA
index 098ff76..0d1bc8a 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +1,7 @@
+# This project was upgraded with external_updater.
+# Usage: tools/external_updater/updater.sh update rust/crates/futures-test
+# For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md
+
name: "futures-test"
description: "()"
third_party {
@@ -7,14 +11,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/futures-test/futures-test-0.3.21.crate"
+ value: "https://static.crates.io/crates/futures-test/futures-test-0.3.25.crate"
}
- version: "0.3.21"
- # Dual-licensed, using the least restrictive per go/thirdpartylicenses#same.
+ version: "0.3.25"
license_type: NOTICE
last_upgrade_date {
year: 2022
- month: 6
- day: 22
+ month: 12
+ day: 12
}
}
diff --git a/src/future/mod.rs b/src/future/mod.rs
index ee5c6dd..0f52f62 100644
--- a/src/future/mod.rs
+++ b/src/future/mod.rs
@@ -68,6 +68,7 @@
///
/// assert_eq!(rx.await, Ok(5));
/// # });
+ /// # std::thread::sleep(std::time::Duration::from_millis(500)); // wait for background threads closed: https://github.com/rust-lang/miri/issues/1371
/// ```
fn run_in_background(self)
where
