Merge #292

292: Bump MSRV to 1.37 r=taiki-e a=taiki-e Bumps MSRV to 1.37 because `underscore_const_names` requires 1.37. This allows removing the build script. It's been more than a year since [1.37 was released](https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html), and most of the users of this crate depend on `futures_api` that requires 1.36 and `async_await` that requires 1.39. so bumping MSRV to 1.37 is probably no problem. Also, given that pin-project-lite's MSRV is 1.37 and the possibility of switching, most futures-related utilities require at least 1.37. cc #264 Refs: #219 Co-authored-by: Taiki Endo <te316e89@gmail.com>
taiki-e · Oct 5, 2020 · 04266f7 · 04266f7
2 parents 6e2ae07 + 94bef4e
commit 04266f7
Show file tree

Hide file tree

Showing 50 changed files with 8 additions and 122 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,8 +26,6 @@ jobs:
         rust:
           # This is the minimum supported Rust version of this crate.
           # When updating this, the reminder to update the minimum supported Rust version in README.md.
-          - 1.34.0
-          - 1.36.0
           - 1.37.0
           - stable
           - beta
@@ -52,12 +50,7 @@ jobs:
         if: matrix.rust == 'nightly'
         run: |
           rustup target add thumbv7m-none-eabi
-      - name: cargo test --tests
-        if: matrix.rust == '1.34.0' || matrix.rust == '1.36.0'
-        run: |
-          cargo test --all --all-features --exclude expandtest --tests
       - name: cargo test
-        if: matrix.rust != '1.34.0' && matrix.rust != '1.36.0'
         run: |
           cargo test --all --all-features --exclude expandtest
       - name: cargo check (no-std)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org).
 
 ## [Unreleased]
 
+* [Raise the minimum supported Rust version of this crate from Rust 1.34 to Rust 1.37.](https://github.com/taiki-e/pin-project/pull/292)
+
 * [Suppress `clippy::redundant_pub_crate` lint in generated code.](https://github.com/taiki-e/pin-project/pull/284)
 
 ## [1.0.0-alpha.1] - 2020-09-22
@@ -206,7 +208,7 @@ See also [tracking issue for 1.0 release](https://github.com/taiki-e/pin-project
   }
   ```
 
-  *[Note: This raises the minimum supported Rust version of this crate from rustc 1.33 to rustc 1.34.](https://github.com/taiki-e/pin-project/pull/219#pullrequestreview-408644187)*
+  *[Note: This raises the minimum supported Rust version of this crate from Rust 1.33 to Rust 1.34.](https://github.com/taiki-e/pin-project/pull/219#pullrequestreview-408644187)*
 
 * [Fixed an issue where duplicate `#[project]` attributes were ignored.][218]
 

diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@
 [docs-url]: https://docs.rs/pin-project
 [license-badge]: https://img.shields.io/badge/license-Apache--2.0%20OR%20MIT-blue.svg
 [license]: #license
-[rustc-badge]: https://img.shields.io/badge/rustc-1.34+-lightgray.svg
-[rustc-url]: https://blog.rust-lang.org/2019/04/11/Rust-1.34.0.html
+[rustc-badge]: https://img.shields.io/badge/rustc-1.37+-lightgray.svg
+[rustc-url]: https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html
 
 A crate for safe and ergonomic [pin-projection].
 
@@ -25,7 +25,7 @@ Add this to your `Cargo.toml`:
 pin-project = "1.0.0-alpha.1"
 ```
 
-The current pin-project requires Rust 1.34 or later.
+The current pin-project requires Rust 1.37 or later.
 
 ## Examples
 

diff --git a/examples/enum-default-expanded.rs b/examples/enum-default-expanded.rs
@@ -40,7 +40,6 @@ where
     Unpinned(&'pin mut (U)),
 }
 
-#[doc(hidden)]
 #[allow(non_upper_case_globals)]
 #[allow(clippy::used_underscore_binding)]
 #[allow(box_pointers)]

diff --git a/examples/not_unpin-expanded.rs b/examples/not_unpin-expanded.rs
@@ -29,7 +29,6 @@ pub struct Struct<T, U> {
     unpinned: U,
 }
 
-#[doc(hidden)]
 #[allow(non_upper_case_globals)]
 #[allow(clippy::used_underscore_binding)]
 #[allow(box_pointers)]

diff --git a/examples/pinned_drop-expanded.rs b/examples/pinned_drop-expanded.rs
@@ -33,7 +33,6 @@ pub struct Struct<'a, T> {
     field: T,
 }
 
-#[doc(hidden)]
 #[allow(non_upper_case_globals)]
 #[allow(clippy::used_underscore_binding)]
 #[allow(box_pointers)]

diff --git a/examples/project_replace-expanded.rs b/examples/project_replace-expanded.rs
@@ -26,7 +26,6 @@ struct Struct<T, U> {
     unpinned: U,
 }
 
-#[doc(hidden)]
 #[allow(non_upper_case_globals)]
 #[allow(clippy::used_underscore_binding)]
 #[allow(box_pointers)]

diff --git a/examples/struct-default-expanded.rs b/examples/struct-default-expanded.rs
@@ -26,7 +26,6 @@ struct Struct<T, U> {
     unpinned: U,
 }
 
-#[doc(hidden)]
 #[allow(non_upper_case_globals)]
 #[allow(clippy::used_underscore_binding)]
 #[allow(box_pointers)]

diff --git a/examples/unsafe_unpin-expanded.rs b/examples/unsafe_unpin-expanded.rs
@@ -28,7 +28,6 @@ pub struct Struct<T, U> {
     unpinned: U,
 }
 
-#[doc(hidden)]
 #[allow(non_upper_case_globals)]
 #[allow(clippy::used_underscore_binding)]
 #[allow(box_pointers)]

diff --git a/pin-project-internal/build.rs b/pin-project-internal/build.rs
diff --git a/pin-project-internal/src/pin_project/derive.rs b/pin-project-internal/src/pin_project/derive.rs
@@ -65,15 +65,7 @@ impl GenerateTokens {
 
         let unpin_impl = make_unpin_impl(cx);
         let drop_impl = make_drop_impl(cx);
-
-        let mut allowed_lints = global_allowed_lints();
-        let dummy_const = if cfg!(underscore_consts) {
-            format_ident!("_")
-        } else {
-            // for Rust 1.34 - 1.36
-            allowed_lints.extend(quote!(#[allow(non_upper_case_globals)]));
-            format_ident!("__SCOPE_{}", cx.orig.ident)
-        };
+        let allowed_lints = global_allowed_lints();
 
         tokens.extend(quote! {
             // All items except projected types are generated inside a `const` scope.
@@ -90,10 +82,9 @@ impl GenerateTokens {
             // * https://github.com/rust-lang/rust/issues/63281
             // * https://github.com/taiki-e/pin-project/pull/53#issuecomment-525906867
             // * https://github.com/taiki-e/pin-project/pull/70
-            #[doc(hidden)] // for Rust 1.34 - 1.41
             #allowed_lints
             #[allow(clippy::used_underscore_binding)]
-            const #dummy_const: () = {
+            const _: () = {
                 #scoped
                 #unpin_impl
                 #drop_impl

diff --git a/tests/expand/tests/expand/default-enum.expanded.rs b/tests/expand/tests/expand/default-enum.expanded.rs
@@ -46,7 +46,6 @@ where
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/default-struct.expanded.rs b/tests/expand/tests/expand/default-struct.expanded.rs
@@ -5,7 +5,6 @@ struct Struct<T, U> {
     pinned: T,
     unpinned: U,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/default-tuple_struct.expanded.rs b/tests/expand/tests/expand/default-tuple_struct.expanded.rs
@@ -1,7 +1,6 @@
 use pin_project::pin_project;
 #[pin(__private())]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/multifields-enum.expanded.rs b/tests/expand/tests/expand/multifields-enum.expanded.rs
@@ -86,7 +86,6 @@ enum EnumProjOwn<T, U> {
     ),
     Unit,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/multifields-struct.expanded.rs b/tests/expand/tests/expand/multifields-struct.expanded.rs
@@ -8,7 +8,6 @@ struct Struct<T, U> {
     unpinned1: U,
     unpinned2: U,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/multifields-tuple_struct.expanded.rs b/tests/expand/tests/expand/multifields-tuple_struct.expanded.rs
@@ -1,7 +1,6 @@
 use pin_project::pin_project;
 #[pin(__private(project_replace))]
 struct TupleStruct<T, U>(#[pin] T, #[pin] T, U, U);
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-enum-all.expanded.rs b/tests/expand/tests/expand/naming-enum-all.expanded.rs
@@ -62,7 +62,6 @@ enum ProjOwn<T, U> {
     Tuple(::pin_project::__private::PhantomData<T>, U),
     Unit,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-enum-mut.expanded.rs b/tests/expand/tests/expand/naming-enum-mut.expanded.rs
@@ -28,7 +28,6 @@ where
     Tuple(::pin_project::__private::Pin<&'pin mut (T)>, &'pin mut (U)),
     Unit,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-enum-none.expanded.rs b/tests/expand/tests/expand/naming-enum-none.expanded.rs
@@ -9,7 +9,6 @@ enum Enum<T, U> {
     Tuple(#[pin] T, U),
     Unit,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-enum-own.expanded.rs b/tests/expand/tests/expand/naming-enum-own.expanded.rs
@@ -25,7 +25,6 @@ enum ProjOwn<T, U> {
     Tuple(::pin_project::__private::PhantomData<T>, U),
     Unit,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-enum-ref.expanded.rs b/tests/expand/tests/expand/naming-enum-ref.expanded.rs
@@ -27,7 +27,6 @@ where
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-struct-all.expanded.rs b/tests/expand/tests/expand/naming-struct-all.expanded.rs
@@ -45,7 +45,6 @@ struct ProjOwn<T, U> {
     pinned: ::pin_project::__private::PhantomData<T>,
     unpinned: U,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-struct-mut.expanded.rs b/tests/expand/tests/expand/naming-struct-mut.expanded.rs
@@ -20,7 +20,6 @@ where
     pinned: ::pin_project::__private::Pin<&'pin mut (T)>,
     unpinned: &'pin mut (U),
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-struct-none.expanded.rs b/tests/expand/tests/expand/naming-struct-none.expanded.rs
@@ -5,7 +5,6 @@ struct Struct<T, U> {
     pinned: T,
     unpinned: U,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-struct-own.expanded.rs b/tests/expand/tests/expand/naming-struct-own.expanded.rs
@@ -16,7 +16,6 @@ struct ProjOwn<T, U> {
     pinned: ::pin_project::__private::PhantomData<T>,
     unpinned: U,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-struct-ref.expanded.rs b/tests/expand/tests/expand/naming-struct-ref.expanded.rs
@@ -19,7 +19,6 @@ where
     pinned: ::pin_project::__private::Pin<&'pin (T)>,
     unpinned: &'pin (U),
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-tuple_struct-all.expanded.rs b/tests/expand/tests/expand/naming-tuple_struct-all.expanded.rs
@@ -30,7 +30,6 @@ where
 #[allow(clippy::pattern_type_mismatch)]
 #[allow(clippy::redundant_pub_crate)]
 struct ProjOwn<T, U>(::pin_project::__private::PhantomData<T>, U);
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-tuple_struct-mut.expanded.rs b/tests/expand/tests/expand/naming-tuple_struct-mut.expanded.rs
@@ -12,7 +12,6 @@ struct TupleStruct<T, U>(#[pin] T, U);
 struct Proj<'pin, T, U>(::pin_project::__private::Pin<&'pin mut (T)>, &'pin mut (U))
 where
     TupleStruct<T, U>: 'pin;
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-tuple_struct-none.expanded.rs b/tests/expand/tests/expand/naming-tuple_struct-none.expanded.rs
@@ -1,7 +1,6 @@
 use pin_project::pin_project;
 #[pin(__private())]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-tuple_struct-own.expanded.rs b/tests/expand/tests/expand/naming-tuple_struct-own.expanded.rs
@@ -9,7 +9,6 @@ struct TupleStruct<T, U>(#[pin] T, U);
 #[allow(clippy::pattern_type_mismatch)]
 #[allow(clippy::redundant_pub_crate)]
 struct ProjOwn<T, U>(::pin_project::__private::PhantomData<T>, U);
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/naming-tuple_struct-ref.expanded.rs b/tests/expand/tests/expand/naming-tuple_struct-ref.expanded.rs
@@ -11,7 +11,6 @@ struct TupleStruct<T, U>(#[pin] T, U);
 struct ProjRef<'pin, T, U>(::pin_project::__private::Pin<&'pin (T)>, &'pin (U))
 where
     TupleStruct<T, U>: 'pin;
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/not_unpin-enum.expanded.rs b/tests/expand/tests/expand/not_unpin-enum.expanded.rs
@@ -46,7 +46,6 @@ where
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/not_unpin-struct.expanded.rs b/tests/expand/tests/expand/not_unpin-struct.expanded.rs
@@ -5,7 +5,6 @@ struct Struct<T, U> {
     pinned: T,
     unpinned: U,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/not_unpin-tuple_struct.expanded.rs b/tests/expand/tests/expand/not_unpin-tuple_struct.expanded.rs
@@ -1,7 +1,6 @@
 use pin_project::pin_project;
 # [pin (__private (! Unpin))]
 struct TupleStruct<T, U>(#[pin] T, U);
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/pinned_drop-enum.expanded.rs b/tests/expand/tests/expand/pinned_drop-enum.expanded.rs
@@ -47,7 +47,6 @@ where
     Tuple(::pin_project::__private::Pin<&'pin (T)>, &'pin (U)),
     Unit,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]

diff --git a/tests/expand/tests/expand/pinned_drop-struct.expanded.rs b/tests/expand/tests/expand/pinned_drop-struct.expanded.rs
@@ -6,7 +6,6 @@ struct Struct<T, U> {
     pinned: T,
     unpinned: U,
 }
-#[doc(hidden)]
 #[allow(box_pointers)]
 #[allow(explicit_outlives_requirements)]
 #[allow(single_use_lifetimes)]