diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-03 03:05:03 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-03 03:05:03 +0000 |
commit | 6e3c9ac725b34f6c27a3b20b13e4b474c7b28477 (patch) | |
tree | 77450a57bcb113372069d89c0c322639805fabba | |
parent | 5c37636fb09a73bd8e5ff998aa431c76b284ce90 (diff) | |
parent | 3c825ba45340356f341b4dc4502f6489cf6518c0 (diff) | |
download | pin-project-internal-android12-release.tar.gz |
Snap for 7256110 from 3c825ba45340356f341b4dc4502f6489cf6518c0 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: Ib3a50afb20bd6a44163a97537f4e71143c53b714
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 9 | ||||
-rw-r--r-- | Cargo.toml | 6 | ||||
-rw-r--r-- | Cargo.toml.orig | 3 | ||||
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | src/pin_project/derive.rs | 1 |
6 files changed, 14 insertions, 15 deletions
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" } } @@ -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 @@ rust_test_host { "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" @@ -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 @@ version = "1" [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 @@ syn = { version = "1.0.56", features = ["full", "visit-mut"] } [dev-dependencies] pin-project = { path = ".." } -rustversion = "1" @@ -7,13 +7,13 @@ third_party { } 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 @@ impl GenerateTokens { // * 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 |