Snap for 7256110 from 3c825ba45340356f341b4dc4502f6489cf6518c0 to sc-v2-release
Change-Id: I4e889d52ae5eca0b5a606cc4a01cf12259c26c59
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index 68cf6e8..6cfdedc 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,5 +1,5 @@
{
"git": {
- "sha1": "5707cf226c74b81387f498bb5d6896d978fccd4a"
+ "sha1": "a51d39fcdb31fe78cc61c0053ead2beb65a4156d"
}
}
diff --git a/Android.bp b/Android.bp
index d37812f..d84760b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
// This file is generated by cargo2android.py --run --dependencies --tests.
+// Do not modify this file as changes will be overridden on upgrade.
package {
default_applicable_licenses: [
@@ -65,12 +66,10 @@
"libquote",
"libsyn",
],
- proc_macros: ["librustversion"],
}
// dependent_library ["feature_list"]
-// proc-macro2-1.0.24 "default,proc-macro"
-// quote-1.0.8 "default,proc-macro"
-// rustversion-1.0.4
-// syn-1.0.60 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+// proc-macro2-1.0.26 "default,proc-macro"
+// quote-1.0.9 "default,proc-macro"
+// syn-1.0.68 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
// unicode-xid-0.2.1 "default"
diff --git a/Cargo.toml b/Cargo.toml
index c98407b..83d10cd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
[package]
edition = "2018"
name = "pin-project-internal"
-version = "1.0.5"
+version = "1.0.6"
authors = ["Taiki Endo <te316e89@gmail.com>"]
description = "Implementation detail of the `pin-project` crate.\n"
documentation = "https://docs.rs/pin-project-internal"
@@ -35,5 +35,5 @@
[dependencies.syn]
version = "1.0.56"
features = ["full", "visit-mut"]
-[dev-dependencies.rustversion]
-version = "1"
+
+[dev-dependencies]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index ab5102c..707c32b 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "pin-project-internal"
-version = "1.0.5"
+version = "1.0.6"
authors = ["Taiki Endo <te316e89@gmail.com>"]
edition = "2018"
license = "Apache-2.0 OR MIT"
@@ -25,4 +25,3 @@
[dev-dependencies]
pin-project = { path = ".." }
-rustversion = "1"
diff --git a/METADATA b/METADATA
index 11efce5..381f041 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.0.5.crate"
+ value: "https://static.crates.io/crates/pin-project-internal/pin-project-internal-1.0.6.crate"
}
- version: "1.0.5"
+ version: "1.0.6"
license_type: NOTICE
last_upgrade_date {
year: 2021
- month: 2
- day: 9
+ month: 4
+ day: 1
}
}
diff --git a/src/pin_project/derive.rs b/src/pin_project/derive.rs
index 4d7d7d8..82539ca 100644
--- a/src/pin_project/derive.rs
+++ b/src/pin_project/derive.rs
@@ -87,6 +87,7 @@
// * https://github.com/taiki-e/pin-project/pull/53#issuecomment-525906867
// * https://github.com/taiki-e/pin-project/pull/70
#allowed_lints
+ #[allow(clippy::semicolon_if_nothing_returned)]
#[allow(clippy::used_underscore_binding)]
const _: () = {
#scoped