From a2c3c5670470c790d3e70ca3392536d4b69e708e Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 1 Apr 2021 16:34:15 -0700 Subject: Upgrade rust/crates/pin-project to 1.0.6 Test: make Change-Id: Ie5387f10f0407e40e47531b42f4d672cfe370e27 --- .cargo_vcs_info.json | 2 +- Android.bp | 9 +++++---- CHANGELOG.md | 7 ++++++- Cargo.toml | 6 +++--- Cargo.toml.orig | 6 +++--- METADATA | 8 ++++---- README.md | 2 +- src/lib.rs | 6 +++--- src/lib.rs.orig | 6 +++--- tests/compiletest.rs | 2 +- tests/expand/default/enum.expanded.rs | 1 + tests/expand/default/struct.expanded.rs | 1 + tests/expand/default/tuple_struct.expanded.rs | 1 + tests/expand/multifields/enum.expanded.rs | 1 + tests/expand/multifields/struct.expanded.rs | 1 + tests/expand/multifields/tuple_struct.expanded.rs | 1 + tests/expand/naming/enum-all.expanded.rs | 1 + tests/expand/naming/enum-mut.expanded.rs | 1 + tests/expand/naming/enum-none.expanded.rs | 1 + tests/expand/naming/enum-own.expanded.rs | 1 + tests/expand/naming/enum-ref.expanded.rs | 1 + tests/expand/naming/struct-all.expanded.rs | 1 + tests/expand/naming/struct-mut.expanded.rs | 1 + tests/expand/naming/struct-none.expanded.rs | 1 + tests/expand/naming/struct-own.expanded.rs | 1 + tests/expand/naming/struct-ref.expanded.rs | 1 + tests/expand/naming/tuple_struct-all.expanded.rs | 1 + tests/expand/naming/tuple_struct-mut.expanded.rs | 1 + tests/expand/naming/tuple_struct-none.expanded.rs | 1 + tests/expand/naming/tuple_struct-own.expanded.rs | 1 + tests/expand/naming/tuple_struct-ref.expanded.rs | 1 + tests/expand/not_unpin/enum.expanded.rs | 1 + tests/expand/not_unpin/struct.expanded.rs | 1 + tests/expand/not_unpin/tuple_struct.expanded.rs | 1 + tests/expand/pinned_drop/enum.expanded.rs | 1 + tests/expand/pinned_drop/struct.expanded.rs | 1 + tests/expand/pinned_drop/tuple_struct.expanded.rs | 1 + tests/expand/project_replace/enum.expanded.rs | 1 + tests/expand/project_replace/struct.expanded.rs | 1 + tests/expand/project_replace/tuple_struct.expanded.rs | 1 + tests/expand/pub/enum.expanded.rs | 1 + tests/expand/pub/struct.expanded.rs | 1 + tests/expand/pub/tuple_struct.expanded.rs | 1 + tests/expand/unsafe_unpin/enum.expanded.rs | 1 + tests/expand/unsafe_unpin/struct.expanded.rs | 1 + tests/expand/unsafe_unpin/tuple_struct.expanded.rs | 1 + tests/lint.rs | 8 ++++---- tests/ui/pin_project/packed_sneaky-3.stderr | 2 ++ 48 files changed, 72 insertions(+), 28 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" } } diff --git a/Android.bp b/Android.bp index 951c3ce..d3b5aa9 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,5 @@ // This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.patch. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: ["external_rust_crates_pin-project_license"], @@ -50,8 +51,8 @@ rust_library { } // dependent_library ["feature_list"] -// pin-project-internal-1.0.5 -// proc-macro2-1.0.24 "default,proc-macro" -// quote-1.0.8 "default,proc-macro" -// syn-1.0.60 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut" +// pin-project-internal-1.0.6 +// 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/CHANGELOG.md b/CHANGELOG.md index a36fdc6..a9b56e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com ## [Unreleased] +## [1.0.6] - 2021-03-25 + +- [Suppress `clippy::semicolon_if_nothing_returned` lint in generated code.](https://github.com/taiki-e/pin-project/pull/318) + ## [1.0.5] - 2021-02-03 - [Suppress `deprecated` lint in generated code.](https://github.com/taiki-e/pin-project/pull/313) @@ -584,7 +588,8 @@ See also [tracking issue for 0.4 release](https://github.com/taiki-e/pin-project Initial release -[Unreleased]: https://github.com/taiki-e/pin-project/compare/v1.0.5...HEAD +[Unreleased]: https://github.com/taiki-e/pin-project/compare/v1.0.6...HEAD +[1.0.6]: https://github.com/taiki-e/pin-project/compare/v1.0.5...v1.0.6 [1.0.5]: https://github.com/taiki-e/pin-project/compare/v1.0.4...v1.0.5 [1.0.4]: https://github.com/taiki-e/pin-project/compare/v1.0.3...v1.0.4 [1.0.3]: https://github.com/taiki-e/pin-project/compare/v1.0.2...v1.0.3 diff --git a/Cargo.toml b/Cargo.toml index f77b1cb..21ff1d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,9 +13,9 @@ [package] edition = "2018" name = "pin-project" -version = "1.0.5" +version = "1.0.6" authors = ["Taiki Endo "] -exclude = ["/.*", "/ci", "/scripts"] +exclude = ["/.*", "/ci", "/tools"] description = "A crate for safe and ergonomic pin-projection.\n" documentation = "https://docs.rs/pin-project" keywords = ["pin", "macros", "attribute"] @@ -25,7 +25,7 @@ repository = "https://github.com/taiki-e/pin-project" [package.metadata.docs.rs] targets = ["x86_64-unknown-linux-gnu"] [dependencies.pin-project-internal] -version = "=1.0.5" +version = "=1.0.6" default-features = false [dev-dependencies.macrotest] version = "1.0.8" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 454fee7..ef46030 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "pin-project" -version = "1.0.5" +version = "1.0.6" authors = ["Taiki Endo "] edition = "2018" license = "Apache-2.0 OR MIT" @@ -8,7 +8,7 @@ repository = "https://github.com/taiki-e/pin-project" documentation = "https://docs.rs/pin-project" keywords = ["pin", "macros", "attribute"] categories = ["no-std", "rust-patterns"] -exclude = ["/.*", "/ci", "/scripts"] +exclude = ["/.*", "/ci", "/tools"] description = """ A crate for safe and ergonomic pin-projection. """ @@ -27,7 +27,7 @@ members = [ ] [dependencies] -pin-project-internal = { version = "=1.0.5", path = "pin-project-internal", default-features = false } +pin-project-internal = { version = "=1.0.6", path = "pin-project-internal", default-features = false } [dev-dependencies] pin-project-auxiliary-macro = { path = "tests/auxiliary/macro" } diff --git a/METADATA b/METADATA index 2bf8bbe..094731f 100644 --- a/METADATA +++ b/METADATA @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/pin-project/pin-project-1.0.5.crate" + value: "https://static.crates.io/crates/pin-project/pin-project-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/README.md b/README.md index 95818e1..0e21654 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![docs.rs](https://img.shields.io/badge/docs.rs-pin--project-blue?style=flat-square)](https://docs.rs/pin-project) [![license](https://img.shields.io/badge/license-Apache--2.0_OR_MIT-blue?style=flat-square)](#license) [![rustc](https://img.shields.io/badge/rustc-1.37+-blue?style=flat-square&logo=rust)](https://www.rust-lang.org) -[![build status](https://img.shields.io/github/workflow/status/taiki-e/pin-project/CI/master?style=flat-square&logo=github)](https://github.com/taiki-e/pin-project/actions) +[![build status](https://img.shields.io/github/workflow/status/taiki-e/pin-project/CI/main?style=flat-square&logo=github)](https://github.com/taiki-e/pin-project/actions) A crate for safe and ergonomic [pin-projection]. diff --git a/src/lib.rs b/src/lib.rs index 12cef30..b7fd8cc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -61,10 +61,10 @@ //! See [`#[pin_project]`][`pin_project`] attribute for more details, and //! see [examples] directory for more examples and generated code. //! -//! [examples]: https://github.com/taiki-e/pin-project/blob/master/examples/README.md -//! [enum-default-expanded]: https://github.com/taiki-e/pin-project/blob/master/examples/enum-default-expanded.rs +//! [examples]: https://github.com/taiki-e/pin-project/blob/HEAD/examples/README.md +//! [enum-default-expanded]: https://github.com/taiki-e/pin-project/blob/HEAD/examples/enum-default-expanded.rs //! [pin-projection]: core::pin#projections-and-structural-pinning -//! [struct-default-expanded]: https://github.com/taiki-e/pin-project/blob/master/examples/struct-default-expanded.rs +//! [struct-default-expanded]: https://github.com/taiki-e/pin-project/blob/HEAD/examples/struct-default-expanded.rs #![no_std] #![doc(test( diff --git a/src/lib.rs.orig b/src/lib.rs.orig index 2aacb81..24cd303 100644 --- a/src/lib.rs.orig +++ b/src/lib.rs.orig @@ -61,10 +61,10 @@ //! See [`#[pin_project]`][`pin_project`] attribute for more details, and //! see [examples] directory for more examples and generated code. //! -//! [examples]: https://github.com/taiki-e/pin-project/blob/master/examples/README.md -//! [enum-default-expanded]: https://github.com/taiki-e/pin-project/blob/master/examples/enum-default-expanded.rs +//! [examples]: https://github.com/taiki-e/pin-project/blob/HEAD/examples/README.md +//! [enum-default-expanded]: https://github.com/taiki-e/pin-project/blob/HEAD/examples/enum-default-expanded.rs //! [pin-projection]: core::pin#projections-and-structural-pinning -//! [struct-default-expanded]: https://github.com/taiki-e/pin-project/blob/master/examples/struct-default-expanded.rs +//! [struct-default-expanded]: https://github.com/taiki-e/pin-project/blob/HEAD/examples/struct-default-expanded.rs #![no_std] #![doc(test( diff --git a/tests/compiletest.rs b/tests/compiletest.rs index e3d713a..b06cb02 100644 --- a/tests/compiletest.rs +++ b/tests/compiletest.rs @@ -3,7 +3,7 @@ use std::env; -#[rustversion::attr(before(2021-01-08), ignore)] // Note: This date is commit-date and the day before the toolchain date. +#[rustversion::attr(before(2021-02-07), ignore)] // Note: This date is commit-date and the day before the toolchain date. #[test] fn ui() { if env::var_os("CI").is_none() { diff --git a/tests/expand/default/enum.expanded.rs b/tests/expand/default/enum.expanded.rs index 490c6b0..e042f8c 100644 --- a/tests/expand/default/enum.expanded.rs +++ b/tests/expand/default/enum.expanded.rs @@ -61,6 +61,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/default/struct.expanded.rs b/tests/expand/default/struct.expanded.rs index ac878b8..2528ece 100644 --- a/tests/expand/default/struct.expanded.rs +++ b/tests/expand/default/struct.expanded.rs @@ -13,6 +13,7 @@ struct Struct { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/default/tuple_struct.expanded.rs b/tests/expand/default/tuple_struct.expanded.rs index 0c5cc1d..3e8e306 100644 --- a/tests/expand/default/tuple_struct.expanded.rs +++ b/tests/expand/default/tuple_struct.expanded.rs @@ -9,6 +9,7 @@ struct TupleStruct(#[pin] T, U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/multifields/enum.expanded.rs b/tests/expand/multifields/enum.expanded.rs index 75e1efe..4c935d7 100644 --- a/tests/expand/multifields/enum.expanded.rs +++ b/tests/expand/multifields/enum.expanded.rs @@ -104,6 +104,7 @@ enum EnumProjOwn { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/multifields/struct.expanded.rs b/tests/expand/multifields/struct.expanded.rs index bd4e6e3..17dab6a 100644 --- a/tests/expand/multifields/struct.expanded.rs +++ b/tests/expand/multifields/struct.expanded.rs @@ -16,6 +16,7 @@ struct Struct { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/multifields/tuple_struct.expanded.rs b/tests/expand/multifields/tuple_struct.expanded.rs index 1ec045c..28e7fd8 100644 --- a/tests/expand/multifields/tuple_struct.expanded.rs +++ b/tests/expand/multifields/tuple_struct.expanded.rs @@ -9,6 +9,7 @@ struct TupleStruct(#[pin] T, #[pin] T, U, U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/naming/enum-all.expanded.rs b/tests/expand/naming/enum-all.expanded.rs index 22d1b8f..561bb89 100644 --- a/tests/expand/naming/enum-all.expanded.rs +++ b/tests/expand/naming/enum-all.expanded.rs @@ -80,6 +80,7 @@ enum ProjOwn { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/naming/enum-mut.expanded.rs b/tests/expand/naming/enum-mut.expanded.rs index fec425c..3489c6e 100644 --- a/tests/expand/naming/enum-mut.expanded.rs +++ b/tests/expand/naming/enum-mut.expanded.rs @@ -39,6 +39,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/naming/enum-none.expanded.rs b/tests/expand/naming/enum-none.expanded.rs index a44ee5f..a33491e 100644 --- a/tests/expand/naming/enum-none.expanded.rs +++ b/tests/expand/naming/enum-none.expanded.rs @@ -17,6 +17,7 @@ enum Enum { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum {} diff --git a/tests/expand/naming/enum-own.expanded.rs b/tests/expand/naming/enum-own.expanded.rs index 091ad37..6ca558b 100644 --- a/tests/expand/naming/enum-own.expanded.rs +++ b/tests/expand/naming/enum-own.expanded.rs @@ -36,6 +36,7 @@ enum ProjOwn { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/naming/enum-ref.expanded.rs b/tests/expand/naming/enum-ref.expanded.rs index 5d3c4c9..0dcb829 100644 --- a/tests/expand/naming/enum-ref.expanded.rs +++ b/tests/expand/naming/enum-ref.expanded.rs @@ -39,6 +39,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/naming/struct-all.expanded.rs b/tests/expand/naming/struct-all.expanded.rs index 660a05a..6506928 100644 --- a/tests/expand/naming/struct-all.expanded.rs +++ b/tests/expand/naming/struct-all.expanded.rs @@ -62,6 +62,7 @@ struct ProjOwn { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Struct { diff --git a/tests/expand/naming/struct-mut.expanded.rs b/tests/expand/naming/struct-mut.expanded.rs index 91552e7..53c5212 100644 --- a/tests/expand/naming/struct-mut.expanded.rs +++ b/tests/expand/naming/struct-mut.expanded.rs @@ -31,6 +31,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/naming/struct-none.expanded.rs b/tests/expand/naming/struct-none.expanded.rs index ac878b8..2528ece 100644 --- a/tests/expand/naming/struct-none.expanded.rs +++ b/tests/expand/naming/struct-none.expanded.rs @@ -13,6 +13,7 @@ struct Struct { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/naming/struct-own.expanded.rs b/tests/expand/naming/struct-own.expanded.rs index 6f4de78..0c1fc76 100644 --- a/tests/expand/naming/struct-own.expanded.rs +++ b/tests/expand/naming/struct-own.expanded.rs @@ -26,6 +26,7 @@ struct ProjOwn { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/naming/struct-ref.expanded.rs b/tests/expand/naming/struct-ref.expanded.rs index 3296c02..3f52ac5 100644 --- a/tests/expand/naming/struct-ref.expanded.rs +++ b/tests/expand/naming/struct-ref.expanded.rs @@ -31,6 +31,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/naming/tuple_struct-all.expanded.rs b/tests/expand/naming/tuple_struct-all.expanded.rs index b78ebf8..325b9db 100644 --- a/tests/expand/naming/tuple_struct-all.expanded.rs +++ b/tests/expand/naming/tuple_struct-all.expanded.rs @@ -47,6 +47,7 @@ struct ProjOwn(::pin_project::__private::PhantomData, U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl TupleStruct { diff --git a/tests/expand/naming/tuple_struct-mut.expanded.rs b/tests/expand/naming/tuple_struct-mut.expanded.rs index 96aa951..8cbb11f 100644 --- a/tests/expand/naming/tuple_struct-mut.expanded.rs +++ b/tests/expand/naming/tuple_struct-mut.expanded.rs @@ -23,6 +23,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/naming/tuple_struct-none.expanded.rs b/tests/expand/naming/tuple_struct-none.expanded.rs index 0c5cc1d..3e8e306 100644 --- a/tests/expand/naming/tuple_struct-none.expanded.rs +++ b/tests/expand/naming/tuple_struct-none.expanded.rs @@ -9,6 +9,7 @@ struct TupleStruct(#[pin] T, U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/naming/tuple_struct-own.expanded.rs b/tests/expand/naming/tuple_struct-own.expanded.rs index 08d9ae3..84bc14b 100644 --- a/tests/expand/naming/tuple_struct-own.expanded.rs +++ b/tests/expand/naming/tuple_struct-own.expanded.rs @@ -19,6 +19,7 @@ struct ProjOwn(::pin_project::__private::PhantomData, U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/naming/tuple_struct-ref.expanded.rs b/tests/expand/naming/tuple_struct-ref.expanded.rs index e06bf0c..587d741 100644 --- a/tests/expand/naming/tuple_struct-ref.expanded.rs +++ b/tests/expand/naming/tuple_struct-ref.expanded.rs @@ -23,6 +23,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/not_unpin/enum.expanded.rs b/tests/expand/not_unpin/enum.expanded.rs index 8d25786..6305b78 100644 --- a/tests/expand/not_unpin/enum.expanded.rs +++ b/tests/expand/not_unpin/enum.expanded.rs @@ -61,6 +61,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/not_unpin/struct.expanded.rs b/tests/expand/not_unpin/struct.expanded.rs index 9d58022..efa660f 100644 --- a/tests/expand/not_unpin/struct.expanded.rs +++ b/tests/expand/not_unpin/struct.expanded.rs @@ -13,6 +13,7 @@ struct Struct { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/not_unpin/tuple_struct.expanded.rs b/tests/expand/not_unpin/tuple_struct.expanded.rs index 525513e..89a257e 100644 --- a/tests/expand/not_unpin/tuple_struct.expanded.rs +++ b/tests/expand/not_unpin/tuple_struct.expanded.rs @@ -9,6 +9,7 @@ struct TupleStruct(#[pin] T, U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/pinned_drop/enum.expanded.rs b/tests/expand/pinned_drop/enum.expanded.rs index 7978ba3..c8eb0e4 100644 --- a/tests/expand/pinned_drop/enum.expanded.rs +++ b/tests/expand/pinned_drop/enum.expanded.rs @@ -62,6 +62,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/pinned_drop/struct.expanded.rs b/tests/expand/pinned_drop/struct.expanded.rs index 1bdeda4..9d7f489 100644 --- a/tests/expand/pinned_drop/struct.expanded.rs +++ b/tests/expand/pinned_drop/struct.expanded.rs @@ -14,6 +14,7 @@ struct Struct { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/pinned_drop/tuple_struct.expanded.rs b/tests/expand/pinned_drop/tuple_struct.expanded.rs index f6cf250..b30ee66 100644 --- a/tests/expand/pinned_drop/tuple_struct.expanded.rs +++ b/tests/expand/pinned_drop/tuple_struct.expanded.rs @@ -10,6 +10,7 @@ struct TupleStruct(#[pin] T, U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/project_replace/enum.expanded.rs b/tests/expand/project_replace/enum.expanded.rs index 6af358b..304e0a7 100644 --- a/tests/expand/project_replace/enum.expanded.rs +++ b/tests/expand/project_replace/enum.expanded.rs @@ -36,6 +36,7 @@ enum EnumProjOwn { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/project_replace/struct.expanded.rs b/tests/expand/project_replace/struct.expanded.rs index d210810..476c0ab 100644 --- a/tests/expand/project_replace/struct.expanded.rs +++ b/tests/expand/project_replace/struct.expanded.rs @@ -13,6 +13,7 @@ struct Struct { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/project_replace/tuple_struct.expanded.rs b/tests/expand/project_replace/tuple_struct.expanded.rs index a48d502..0026a9f 100644 --- a/tests/expand/project_replace/tuple_struct.expanded.rs +++ b/tests/expand/project_replace/tuple_struct.expanded.rs @@ -9,6 +9,7 @@ struct TupleStruct(#[pin] T, U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/pub/enum.expanded.rs b/tests/expand/pub/enum.expanded.rs index 42396ac..5026bad 100644 --- a/tests/expand/pub/enum.expanded.rs +++ b/tests/expand/pub/enum.expanded.rs @@ -61,6 +61,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/pub/struct.expanded.rs b/tests/expand/pub/struct.expanded.rs index 34b1c79..246d9b6 100644 --- a/tests/expand/pub/struct.expanded.rs +++ b/tests/expand/pub/struct.expanded.rs @@ -13,6 +13,7 @@ pub struct Struct { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/pub/tuple_struct.expanded.rs b/tests/expand/pub/tuple_struct.expanded.rs index 8dbcf91..033fbaf 100644 --- a/tests/expand/pub/tuple_struct.expanded.rs +++ b/tests/expand/pub/tuple_struct.expanded.rs @@ -9,6 +9,7 @@ pub struct TupleStruct(#[pin] pub T, pub U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/unsafe_unpin/enum.expanded.rs b/tests/expand/unsafe_unpin/enum.expanded.rs index faf87fc..df962d0 100644 --- a/tests/expand/unsafe_unpin/enum.expanded.rs +++ b/tests/expand/unsafe_unpin/enum.expanded.rs @@ -61,6 +61,7 @@ where #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { impl Enum { diff --git a/tests/expand/unsafe_unpin/struct.expanded.rs b/tests/expand/unsafe_unpin/struct.expanded.rs index c01668e..4066d49 100644 --- a/tests/expand/unsafe_unpin/struct.expanded.rs +++ b/tests/expand/unsafe_unpin/struct.expanded.rs @@ -13,6 +13,7 @@ struct Struct { #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/expand/unsafe_unpin/tuple_struct.expanded.rs b/tests/expand/unsafe_unpin/tuple_struct.expanded.rs index 3c9afb8..59a40da 100644 --- a/tests/expand/unsafe_unpin/tuple_struct.expanded.rs +++ b/tests/expand/unsafe_unpin/tuple_struct.expanded.rs @@ -9,6 +9,7 @@ struct TupleStruct(#[pin] T, U); #[allow(clippy::unknown_clippy_lints)] #[allow(clippy::pattern_type_mismatch)] #[allow(clippy::redundant_pub_crate)] +#[allow(clippy::semicolon_if_nothing_returned)] #[allow(clippy::used_underscore_binding)] const _: () = { #[allow(box_pointers)] diff --git a/tests/lint.rs b/tests/lint.rs index 527c533..e7aee5a 100644 --- a/tests/lint.rs +++ b/tests/lint.rs @@ -1,4 +1,4 @@ -#![warn(nonstandard_style, rust_2018_idioms, rustdoc, unused)] +#![warn(nonstandard_style, rust_2018_idioms, unused)] // Note: This does not guarantee compatibility with forbidding these lints in the future. // If rustc adds a new lint, we may not be able to keep this. #![forbid(future_incompatible, rust_2018_compatibility)] @@ -6,16 +6,17 @@ #![warn( box_pointers, deprecated_in_future, + disjoint_capture_drop_reorder, elided_lifetimes_in_paths, explicit_outlives_requirements, macro_use_extern_crate, meta_variable_misuse, missing_abi, missing_copy_implementations, - missing_crate_level_docs, missing_debug_implementations, missing_docs, non_ascii_idents, + noop_method_call, single_use_lifetimes, trivial_casts, trivial_numeric_casts, @@ -29,8 +30,7 @@ variant_size_differences )] // absolute_paths_not_starting_with_crate, anonymous_parameters, keyword_idents, pointer_structural_match, semicolon_in_expressions_from_macros: forbidden as a part of future_incompatible -// missing_doc_code_examples, private_doc_tests, invalid_html_tags: warned as a part of rustdoc -// unsafe_block_in_unsafe_fn: unstable +// unsafe_block_in_unsafe_fn: unstable: https://github.com/rust-lang/rust/issues/71668 // unsafe_code: checked in forbid_unsafe module // unstable_features: deprecated: https://doc.rust-lang.org/beta/rustc/lints/listing/allowed-by-default.html#unstable-features // unused_crate_dependencies: unrelated diff --git a/tests/ui/pin_project/packed_sneaky-3.stderr b/tests/ui/pin_project/packed_sneaky-3.stderr index b711d05..b953e9f 100644 --- a/tests/ui/pin_project/packed_sneaky-3.stderr +++ b/tests/ui/pin_project/packed_sneaky-3.stderr @@ -3,6 +3,8 @@ error: expected item after attributes | 4 | hidden_repr_macro! {} //~ ERROR expected item after attributes | ^^^^^^^^^^^^^^^^^^^^^ + | + = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) error: expected item after attributes --> $DIR/packed_sneaky-3.rs:13:9 -- cgit v1.2.3