Merge #871

bors[bot] · Bromeon · web-flow · commit 4e669765c519 · 2022-03-06T22:17:46.000Z
871: Rust 2021 Edition r=Bromeon a=Bromeon

Updates edition to 2021 and MSRV to 1.56.
Adjusts CI accordingly.

bors try

Co-authored-by: Jan Haller &lt;bromeon@gmail.com&gt;
diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml
@@ -34,6 +34,7 @@ env:
   # Note: using variables is limited at the moment, see https://github.com/actions/runner/issues/480
   GDRUST_FEATURES: "gdnative/async,gdnative/serde"
   CARGO_DENY_VERSION: "0.11.0"
+  CARGO_DINGHY_VERSION: "0.4.68"
 
 on:
   push:
@@ -121,7 +122,7 @@ jobs:
           - rust: { toolchain: 'nightly' }
             testflags: '-- --skip ui_tests'
           - os: { id: ubuntu-latest, name: linux }
-            rust: { toolchain: '1.51', postfix: ' (msrv 1.51)' }
+            rust: { toolchain: '1.56', postfix: ' (msrv 1.56)' }
             testflags: '-- --skip ui_tests'
           - os: { id: ubuntu-latest, name: linux }
             rust: { toolchain: 'stable', postfix: ' (minimal-deps)', special: 'minimal-deps' }
@@ -194,10 +195,10 @@ jobs:
       - name: "Install cargo-dinghy"
         run: |
           rustup target add x86_64-apple-ios
-          curl -L https://github.com/sonos/dinghy/releases/download/0.4.62/cargo-dinghy-macos-0.4.62.tgz -o cargo-dinghy-macos.tar.gz
+          curl -L https://github.com/sonos/dinghy/releases/download/$CARGO_DINGHY_VERSION/cargo-dinghy-macos-$CARGO_DINGHY_VERSION.tgz -o cargo-dinghy-macos.tar.gz
           tar -zxvf cargo-dinghy-macos.tar.gz
           mkdir -p $HOME/.cargo/bin
-          cp cargo-dinghy-0.4.62/cargo-dinghy $HOME/.cargo/bin
+          cp cargo-dinghy-$CARGO_DINGHY_VERSION/cargo-dinghy $HOME/.cargo/bin
       - name: "Cross-compile to iOS"
         run: |
           RUNTIME_ID=$(xcrun simctl list runtimes | grep iOS | cut -d ' ' -f 7 | tail -1)
@@ -253,9 +254,9 @@ jobs:
           - rust: nightly
             godot: "3.4.1"
             postfix: ' (nightly)'
-          - rust: '1.51'
+          - rust: '1.56'
             godot: "3.4.1"
-            postfix: ' (msrv 1.51)'
+            postfix: ' (msrv 1.56)'
 
           # Test with oldest supported engine version
           - rust: stable
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,7 +43,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- MSRV is now 1.51 ([#833](https://github.com/godot-rust/godot-rust/pull/833))
+- MSRV is now 1.56 ([#833](https://github.com/godot-rust/godot-rust/pull/833), [#870](https://github.com/godot-rust/godot-rust/pull/870))
+- Rust edition is now 2021 ([#870](https://github.com/godot-rust/godot-rust/pull/870))
 - `euclid` vector library replaced with `glam`, no longer part of public API ([#713](https://github.com/godot-rust/godot-rust/pull/713))
 - `Variant` has now a redesigned conversion API ([#819](https://github.com/godot-rust/godot-rust/pull/819))
 - Type renames (815, 828)
diff --git a/README.md b/README.md
@@ -14,6 +14,8 @@
 
 The bindings cover most of the exposed API of Godot 3.4, and are being used on a number of projects in development, but we still expect non-trivial breaking changes in the API in the coming releases. godot-rust adheres to [Cargo's semantic versioning](https://doc.rust-lang.org/cargo/reference/semver.html).
 
+Minimum supported Rust version (MSRV) is **1.56**.
+
 ## Engine compatibility
 
 We are committed to keeping compatibility with the latest stable patch releases of all minor versions of the engine, starting from Godot 3.2:
diff --git a/bindings-generator/Cargo.toml b/bindings-generator/Cargo.toml
@@ -8,7 +8,8 @@ homepage = "https://godot-rust.github.io/"
 license = "MIT"
 version = "0.10.0-rc.0"
 workspace = ".."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [features]
 debug = []
diff --git a/bindings-generator/src/classes.rs b/bindings-generator/src/classes.rs
@@ -76,7 +76,7 @@ pub(crate) fn generate_class_constants(class: &GodotClass) -> TokenStream {
         class.constants.iter().collect();
     class_constants.sort_by(constant_sorter);
 
-    for (name, value) in &class_constants {
+    for (name, value) in class_constants {
         let name = format_ident!("{}", name);
         let constant = quote! {
             pub const #name: i64 = #value;
diff --git a/bindings-generator/src/godot_version.rs b/bindings-generator/src/godot_version.rs
@@ -54,15 +54,15 @@ fn test_godot_versions() {
     ];
 
     // From Rust 1.56: 'for (...) in good_versions'
-    for (full, major, minor, patch, stability) in good_versions.iter().cloned() {
+    for (full, major, minor, patch, stability) in good_versions {
         let parsed: GodotVersion = parse_godot_version(full).unwrap();
         assert_eq!(parsed.major, major);
         assert_eq!(parsed.minor, minor);
         assert_eq!(parsed.patch, patch);
         assert_eq!(parsed.stability, stability);
     }
 
-    for full in bad_versions.iter() {
+    for full in bad_versions {
         let parsed = parse_godot_version(full);
         assert!(parsed.is_err());
     }
diff --git a/bindings-generator/src/lib.rs b/bindings-generator/src/lib.rs
@@ -225,7 +225,7 @@ pub(crate) mod test_prelude {
 
         let api = Api::new(include_str!("../../gdnative-bindings/api.json"));
         let mut buffer = BufWriter::new(Vec::with_capacity(16384));
-        for class in &api.classes {
+        for class in api.classes {
             let mut icalls = HashMap::new();
 
             let code = generate_module_doc(&class);
diff --git a/examples/array-export/Cargo.toml b/examples/array-export/Cargo.toml
@@ -2,7 +2,8 @@
 name = "array_export"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 publish = false
 
diff --git a/examples/dodge-the-creeps/Cargo.toml b/examples/dodge-the-creeps/Cargo.toml
@@ -3,7 +3,8 @@ name = "dodge_the_creeps"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 
 [lib]
diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml
@@ -3,7 +3,8 @@ name = "hello_world"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 
 [lib]
diff --git a/examples/native-plugin/Cargo.toml b/examples/native-plugin/Cargo.toml
@@ -2,7 +2,8 @@
 name = "native_plugin"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 publish = false
 
diff --git a/examples/resource/Cargo.toml b/examples/resource/Cargo.toml
@@ -3,7 +3,8 @@ name = "resource"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 
 [lib]
diff --git a/examples/rpc/Cargo.toml b/examples/rpc/Cargo.toml
@@ -3,7 +3,8 @@ name = "rpc"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 
 [lib]
diff --git a/examples/scene-create/Cargo.toml b/examples/scene-create/Cargo.toml
@@ -3,7 +3,8 @@ name = "scene_create"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 
 [lib]
diff --git a/examples/signals/Cargo.toml b/examples/signals/Cargo.toml
@@ -2,7 +2,8 @@
 name = "signals"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 publish = false
 
diff --git a/examples/spinning-cube/Cargo.toml b/examples/spinning-cube/Cargo.toml
@@ -2,7 +2,8 @@
 name = "spinning_cube"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 publish = false
 
diff --git a/gdnative-async/Cargo.toml b/gdnative-async/Cargo.toml
@@ -8,7 +8,8 @@ homepage = "https://godot-rust.github.io/"
 version = "0.10.0-rc.0"
 license = "MIT"
 workspace = ".."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [features]
 
diff --git a/gdnative-bindings/Cargo.toml b/gdnative-bindings/Cargo.toml
@@ -8,7 +8,8 @@ homepage = "https://godot-rust.github.io/"
 version = "0.10.0-rc.0"
 license = "MIT"
 workspace = ".."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [features]
 formatted = []
diff --git a/gdnative-core/Cargo.toml b/gdnative-core/Cargo.toml
@@ -8,7 +8,8 @@ homepage = "https://godot-rust.github.io/"
 version = "0.10.0-rc.0"
 license = "MIT"
 workspace = ".."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [features]
 default = []
diff --git a/gdnative-core/src/core_types/dictionary.rs b/gdnative-core/src/core_types/dictionary.rs
@@ -446,7 +446,6 @@ impl<'a, Own: Ownership> Iterator for Iter<'a, Own> {
 
     #[inline]
     fn size_hint(&self) -> (usize, Option<usize>) {
-        use std::convert::TryFrom;
         (0, usize::try_from(self.dic.len()).ok())
     }
 }
@@ -490,7 +489,6 @@ impl Iterator for IntoIter {
 
     #[inline]
     fn size_hint(&self) -> (usize, Option<usize>) {
-        use std::convert::TryFrom;
         (0, usize::try_from(self.dic.len()).ok())
     }
 }
diff --git a/gdnative-core/src/core_types/pool_array.rs b/gdnative-core/src/core_types/pool_array.rs
@@ -1,4 +1,3 @@
-use std::convert::TryFrom;
 use std::fmt;
 use std::iter::{Extend, FromIterator};
 
diff --git a/gdnative-core/src/core_types/string.rs b/gdnative-core/src/core_types/string.rs
@@ -4,7 +4,6 @@ use crate::private::get_api;
 use crate::sys;
 
 use std::cmp::Ordering;
-use std::convert::TryFrom;
 use std::ffi::CStr;
 use std::fmt;
 use std::mem::forget;
diff --git a/gdnative-core/src/core_types/variant.rs b/gdnative-core/src/core_types/variant.rs
@@ -1584,8 +1584,6 @@ impl<T: ToVariant> ToVariant for Vec<T> {
 impl<T: FromVariant> FromVariant for Vec<T> {
     #[inline]
     fn from_variant(variant: &Variant) -> Result<Self, FromVariantError> {
-        use std::convert::TryInto;
-
         let arr = VariantArray::from_variant(variant)?;
         let len: usize = arr
             .len()
diff --git a/gdnative-core/src/core_types/variant_array.rs b/gdnative-core/src/core_types/variant_array.rs
@@ -433,7 +433,6 @@ impl<'a, Own: Ownership> Iterator for Iter<'a, Own> {
 
     #[inline]
     fn nth(&mut self, n: usize) -> Option<Self::Item> {
-        use std::convert::TryFrom;
         let n = i32::try_from(n).ok()?;
 
         if self.arr.len() > n {
@@ -486,7 +485,6 @@ impl Iterator for IntoIter {
 
     #[inline]
     fn nth(&mut self, n: usize) -> Option<Self::Item> {
-        use std::convert::TryFrom;
         let n = i32::try_from(n).ok()?;
 
         if self.arr.len() > n {
diff --git a/gdnative-core/src/profiler.rs b/gdnative-core/src/profiler.rs
@@ -1,7 +1,6 @@
 //! Interface to Godot's built-in profiler.
 
 use std::borrow::Cow;
-use std::convert::TryFrom;
 use std::ffi::{CStr, CString};
 use std::time::{Duration, Instant};
 
diff --git a/gdnative-derive/Cargo.toml b/gdnative-derive/Cargo.toml
@@ -8,7 +8,8 @@ homepage = "https://godot-rust.github.io/"
 version = "0.10.0-rc.0"
 license = "MIT"
 workspace = ".."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [lib]
 proc-macro = true
diff --git a/gdnative-derive/src/native_script.rs b/gdnative-derive/src/native_script.rs
@@ -162,7 +162,7 @@ pub(crate) fn derive_native_class(derive_input: &DeriveInput) -> Result<TokenStr
 
                 let label = config.path.unwrap_or_else(|| format!("{}", ident));
                 Ok(quote!({
-                    builder.property#property_ty(#label)
+                    builder.property #property_ty(#label)
                         #with_default
                         #with_hint
                         #with_usage
@@ -287,7 +287,7 @@ fn parse_derive_input(input: &DeriveInput) -> Result<DeriveData, syn::Error> {
                         let attr_args_builder = property_args
                             .get_or_insert_with(|| PropertyAttrArgsBuilder::new(&field.ty));
 
-                        for arg in &nested {
+                        for arg in nested {
                             if let NestedMeta::Meta(Meta::NameValue(ref pair)) = arg {
                                 attr_args_builder.add_pair(pair)?;
                             } else if let NestedMeta::Meta(Meta::Path(ref path)) = arg {
@@ -473,9 +473,9 @@ mod tests {
             (attr_getp_setp, true, true),
         ];
 
-        for (attr, allowed_bare, allowed_property) in &combinations {
-            check_property_combination(attr, quote! { i32 }, *allowed_bare);
-            check_property_combination(attr, quote! { Property<i32> }, *allowed_property);
+        for (attr, allowed_bare, allowed_property) in combinations {
+            check_property_combination(&attr, quote! { i32 }, allowed_bare);
+            check_property_combination(&attr, quote! { Property<i32> }, allowed_property);
         }
     }
 
diff --git a/gdnative-derive/src/varargs.rs b/gdnative-derive/src/varargs.rs
@@ -48,7 +48,7 @@ pub(crate) fn derive_from_varargs(input: DeriveInput) -> Result<TokenStream2, sy
 
         let mut required = Vec::new();
         let mut optional = Vec::new();
-        for field in fields.iter() {
+        for field in fields {
             let is_optional = field.attrs.iter().any(|attr| attr.path.is_ident("opt"));
             if !is_optional && !optional.is_empty() {
                 return Err(syn::Error::new(
diff --git a/gdnative-sys/Cargo.toml b/gdnative-sys/Cargo.toml
@@ -9,7 +9,8 @@ version = "0.10.0-rc.0"
 build = "build.rs"
 license = "MIT"
 workspace = ".."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [dependencies]
 libc = "0.2"
diff --git a/gdnative/Cargo.toml b/gdnative/Cargo.toml
@@ -10,9 +10,8 @@ version = "0.10.0-rc.0"
 license = "MIT"
 workspace = ".."
 readme = "../README.md"
-edition = "2018"
-# once edition is 2021, see https://doc.rust-lang.org/cargo/reference/manifest.html#the-rust-version-field:
-# rust-version = "1.56"
+edition = "2021"
+rust-version = "1.56"
 
 [features]
 # Public
diff --git a/impl/proc-macros/Cargo.toml b/impl/proc-macros/Cargo.toml
@@ -7,7 +7,8 @@ homepage = "https://godot-rust.github.io/"
 version = "0.10.0-rc.0"
 license = "MIT"
 workspace = "../.."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 
 [lib]
 proc-macro = true
diff --git a/test/Cargo.toml b/test/Cargo.toml
@@ -2,7 +2,8 @@
 name = "gdnative-test"
 version = "0.1.0"
 workspace = ".."
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 license = "MIT"
 publish = false
 
