aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2021-02-09 17:13:37 -0800
committerHaibo Huang <hhb@google.com>2021-02-09 17:13:37 -0800
commit8a59626f3e49087a88d99ee0d71e21f2703f316f (patch)
tree9b27563e8127459707db23e633f6bb405669aee7
parent63d8a019ab595a197a56a3b2569e797f5c68a573 (diff)
downloadfutures-sink-8a59626f3e49087a88d99ee0d71e21f2703f316f.tar.gz
Upgrade rust/crates/futures-sink to 0.3.12
Test: make Change-Id: Id7ffb8e6efcb6b7e749108181177b82cc12f544f
-rw-r--r--.cargo_vcs_info.json5
-rw-r--r--Android.bp3
-rw-r--r--Cargo.toml4
-rw-r--r--Cargo.toml.orig4
-rw-r--r--METADATA10
-rw-r--r--TEST_MAPPING10
-rw-r--r--src/lib.rs8
7 files changed, 18 insertions, 26 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
new file mode 100644
index 0000000..4fd4ba3
--- /dev/null
+++ b/.cargo_vcs_info.json
@@ -0,0 +1,5 @@
+{
+ "git": {
+ "sha1": "1d53a29ec16ccd5b094fb205edb73591455eb4b6"
+ }
+}
diff --git a/Android.bp b/Android.bp
index c366be0..e48053a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -17,6 +17,9 @@ rust_defaults {
rust_test_host {
name: "futures-sink_host_test_src_lib",
defaults: ["futures-sink_defaults"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
diff --git a/Cargo.toml b/Cargo.toml
index 4944486..38daaa4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,11 +13,11 @@
[package]
edition = "2018"
name = "futures-sink"
-version = "0.3.7"
+version = "0.3.12"
authors = ["Alex Crichton <alex@alexcrichton.com>"]
description = "The asynchronous `Sink` trait for the futures-rs library.\n"
homepage = "https://rust-lang.github.io/futures-rs"
-documentation = "https://docs.rs/futures-sink/0.3.7"
+documentation = "https://docs.rs/futures-sink/0.3"
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/futures-rs"
[package.metadata.docs.rs]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 9b66b3a..327e453 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,12 +1,12 @@
[package]
name = "futures-sink"
edition = "2018"
-version = "0.3.7"
+version = "0.3.12"
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-sink/0.3.7"
+documentation = "https://docs.rs/futures-sink/0.3"
description = """
The asynchronous `Sink` trait for the futures-rs library.
"""
diff --git a/METADATA b/METADATA
index f7357cf..3b2dc1c 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/futures-sink/futures-sink-0.3.7.crate"
+ value: "https://static.crates.io/crates/futures-sink/futures-sink-0.3.12.crate"
}
- version: "0.3.7"
+ version: "0.3.12"
license_type: NOTICE
last_upgrade_date {
- year: 2020
- month: 10
- day: 25
+ year: 2021
+ month: 2
+ day: 9
}
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 60d469b..533fae9 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,18 +1,10 @@
-// Generated by cargo2android.py for tests in Android.bp
+// Generated by update_crate_tests.py for tests that depend on this crate.
{
"presubmit": [
{
- "host": true,
- "name": "futures-sink_host_test_src_lib"
- },
- {
"name": "futures-sink_device_test_src_lib"
},
{
- "host": true,
- "name": "futures-util_host_test_src_lib"
- },
- {
"name": "futures-util_device_test_src_lib"
}
]
diff --git a/src/lib.rs b/src/lib.rs
index 8ee257e..6193f51 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,16 +8,8 @@
// It cannot be included in the published code because this lints have false positives in the minimum required version.
#![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-sink/0.3.7")]
-
#[cfg(feature = "alloc")]
extern crate alloc;