aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-08-10 16:27:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-10 16:27:13 +0000
commit1d7a91076d2497a9fdd6d2877534cd6ff6226255 (patch)
tree6ef65be3885d7e12273860d750b2c303b05f01d3
parent68f8f6bfca1824efb58ab2a130bf5244a094f6a6 (diff)
parent3cc1631da6d66f718af5cc19fd6ce5aafaeb6f29 (diff)
downloadfutures-sink-1d7a91076d2497a9fdd6d2877534cd6ff6226255.tar.gz
Upgrade rust/crates/futures-sink to 0.3.16 am: 3116f9fcd9 am: 14051dbbc1 am: 3cc1631da6
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures-sink/+/1790988 Change-Id: I8527a58dfe0f70deb330c9ab826334250f18e237
-rw-r--r--.cargo_vcs_info.json2
-rw-r--r--Android.bp6
-rw-r--r--Cargo.toml11
-rw-r--r--Cargo.toml.orig2
-rw-r--r--METADATA8
-rw-r--r--src/lib.rs11
6 files changed, 22 insertions, 18 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index ec6442e..99dc8b0 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "fc080d153bc7bf00429ec5e2b91e2f21f2243846"
+ "sha1": "ab38fd29d3f84f8fc028fa7883e53dba423da0ee"
}
}
diff --git a/Android.bp b/Android.bp
index ec62b3d..d6b1958 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,7 +38,7 @@ license {
}
rust_defaults {
- name: "futures-sink_defaults",
+ name: "futures-sink_test_defaults",
crate_name: "futures_sink",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
@@ -53,7 +53,7 @@ rust_defaults {
rust_test_host {
name: "futures-sink_host_test_src_lib",
- defaults: ["futures-sink_defaults"],
+ defaults: ["futures-sink_test_defaults"],
test_options: {
unit_test: true,
},
@@ -61,7 +61,7 @@ rust_test_host {
rust_test {
name: "futures-sink_device_test_src_lib",
- defaults: ["futures-sink_defaults"],
+ defaults: ["futures-sink_test_defaults"],
}
rust_library {
diff --git a/Cargo.toml b/Cargo.toml
index 35839be..7f83c0a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,17 +3,16 @@
# When uploading crates to the registry Cargo will automatically
# "normalize" Cargo.toml files for maximal compatibility
# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
[package]
edition = "2018"
name = "futures-sink"
-version = "0.3.15"
+version = "0.3.16"
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"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 02cb0d3..2144518 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,7 +1,7 @@
[package]
name = "futures-sink"
edition = "2018"
-version = "0.3.15"
+version = "0.3.16"
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 1eae0d4..3e2cc90 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.15.crate"
+ value: "https://static.crates.io/crates/futures-sink/futures-sink-0.3.16.crate"
}
- version: "0.3.15"
+ version: "0.3.16"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 5
- day: 19
+ month: 8
+ day: 9
}
}
diff --git a/src/lib.rs b/src/lib.rs
index 4dc2fb3..0328740 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,11 +4,16 @@
//! asynchronously.
#![cfg_attr(not(feature = "std"), no_std)]
-#![warn(missing_docs, missing_debug_implementations, rust_2018_idioms, unreachable_pub)]
+#![warn(missing_debug_implementations, missing_docs, rust_2018_idioms, unreachable_pub)]
// 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)]
-#![doc(test(attr(deny(warnings), allow(dead_code, unused_assignments, unused_variables))))]
+#![doc(test(
+ no_crate_inject,
+ attr(
+ deny(warnings, rust_2018_idioms, single_use_lifetimes),
+ allow(dead_code, unused_assignments, unused_variables)
+ )
+))]
#[cfg(feature = "alloc")]
extern crate alloc;