Migrate to Rust 2021

taiki-e · Jul 27, 2023 · 38ffa9b · 38ffa9b
1 parent cd1139a
commit 38ffa9b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -26,7 +26,7 @@ use_try_shorthand = true
 
 # Set the default settings again to always apply the proper formatting without
 # being affected by the editor settings.
-edition = "2018"
+edition = "2021"
 hard_tabs = false
 newline_style = "Unix"
 tab_spaces = 4
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pin-project"
 version = "1.1.2"
-edition = "2018"
+edition = "2021"
 rust-version = "1.56"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/taiki-e/pin-project"
@@ -16,6 +16,7 @@ A crate for safe and ergonomic pin-projection.
 targets = ["x86_64-unknown-linux-gnu"]
 
 [workspace]
+resolver = "2"
 members = [
     "pin-project-internal",
     "tests/auxiliary/macro",

diff --git a/pin-project-internal/Cargo.toml b/pin-project-internal/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pin-project-internal"
 version = "1.1.2"
-edition = "2018"
+edition = "2021"
 rust-version = "1.56"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/taiki-e/pin-project"

diff --git a/pin-project-internal/src/utils.rs b/pin-project-internal/src/utils.rs
@@ -1,4 +1,4 @@
-use std::{iter::FromIterator, mem};
+use std::mem;
 
 use proc_macro2::{Group, Spacing, Span, TokenStream, TokenTree};
 use quote::{quote, quote_spanned, ToTokens};

diff --git a/tests/auxiliary/macro/Cargo.toml b/tests/auxiliary/macro/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "pin-project-auxiliary-macro"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]

diff --git a/tests/lint.rs b/tests/lint.rs
@@ -43,7 +43,14 @@
 )]
 #![warn(clippy::all, clippy::pedantic, clippy::nursery, clippy::restriction)]
 #![allow(clippy::blanket_clippy_restriction_lints)] // this is a test, so enable all restriction lints intentionally.
-#![allow(clippy::exhaustive_structs, clippy::exhaustive_enums, clippy::single_char_lifetime_names)] // TODO
+#![allow(
+    clippy::exhaustive_enums,
+    clippy::exhaustive_structs,
+    clippy::min_ident_chars,
+    clippy::pub_with_shorthand,
+    clippy::single_call_fn,
+    clippy::single_char_lifetime_names
+)] // TODO
 
 pub mod basic {
     include!("include/basic.rs");

diff --git a/tests/no-core/Cargo.toml b/tests/no-core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "no-core"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]

diff --git a/tests/no-std/Cargo.toml b/tests/no-std/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "no-std"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 publish = false
 
 [lib]