Raise MSRV from 1.56 to 1.63

godot-rust · Sep 7, 2022 · e154c82 · e154c82
1 parent 3f4399c
commit e154c82
Show file tree

Hide file tree

Showing 23 changed files with 32 additions and 26 deletions.
diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml
@@ -135,7 +135,7 @@ jobs:
           - rust: { toolchain: 'nightly' }
             testflags: '-- --skip ui_tests'
           - os: { id: ubuntu-latest, name: linux }
-            rust: { toolchain: '1.56', postfix: ' (msrv 1.56)' }
+            rust: { toolchain: '1.63', postfix: ' (msrv 1.63)' }
             testflags: '-- --skip ui_tests'
           - os: { id: ubuntu-latest, name: linux }
             rust: { toolchain: 'stable', postfix: ' (minimal-deps)', special: 'minimal-deps' }
@@ -281,9 +281,9 @@ jobs:
           - rust: nightly
             godot: "3.5.1-rc1"
             postfix: ' (nightly)'
-          - rust: '1.56'
+          - rust: '1.63'
             godot: "3.5.1-rc1"
-            postfix: ' (msrv 1.56)'
+            postfix: ' (msrv 1.63)'
 
           # Test with oldest supported engine version
           - rust: stable

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.11.0] - unreleased
+
+### Changed
+
+- Changed supported Godot version to 3.5.1 ([#910](https://github.com/godot-rust/godot-rust/pull/910))
+- MSRV is now 1.63 ([#910](https://github.com/godot-rust/godot-rust/pull/910))
 
 ## [0.10.2] - unreleased
 

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@
 
 The bindings cover most of the exposed API of Godot 3.5, 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**. We use the Rust 2021 Edition.
+Minimum supported Rust version (MSRV) is **1.63**. We use the Rust 2021 Edition.
 
 ## Engine compatibility
 

diff --git a/bindings-generator/Cargo.toml b/bindings-generator/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT"
 version = "0.10.1"
 workspace = ".."
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 
 [features]
 debug = []

diff --git a/examples/builder-export/Cargo.toml b/examples/builder-export/Cargo.toml
@@ -3,7 +3,7 @@ name = "builder-export"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 publish = false
 

diff --git a/examples/dodge-the-creeps/Cargo.toml b/examples/dodge-the-creeps/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 
 [lib]

diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 
 [lib]

diff --git a/examples/native-plugin/Cargo.toml b/examples/native-plugin/Cargo.toml
@@ -3,7 +3,7 @@ name = "native-plugin"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 publish = false
 

diff --git a/examples/property-export/Cargo.toml b/examples/property-export/Cargo.toml
@@ -3,7 +3,7 @@ name = "property-export"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 publish = false
 

diff --git a/examples/resource/Cargo.toml b/examples/resource/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 
 [lib]

diff --git a/examples/rpc/Cargo.toml b/examples/rpc/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 
 [lib]

diff --git a/examples/scene-create/Cargo.toml b/examples/scene-create/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["The godot-rust developers"]
 publish = false
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 
 [lib]

diff --git a/examples/signals/Cargo.toml b/examples/signals/Cargo.toml
@@ -3,7 +3,7 @@ name = "signals"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 publish = false
 

diff --git a/examples/spinning-cube/Cargo.toml b/examples/spinning-cube/Cargo.toml
@@ -3,7 +3,7 @@ name = "spinning-cube"
 version = "0.1.0"
 authors = ["The godot-rust developers"]
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 publish = false
 

diff --git a/gdnative-async/Cargo.toml b/gdnative-async/Cargo.toml
@@ -9,7 +9,7 @@ version = "0.10.1"
 license = "MIT"
 workspace = ".."
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 
 [features]
 

diff --git a/gdnative-bindings/Cargo.toml b/gdnative-bindings/Cargo.toml
@@ -9,7 +9,7 @@ version = "0.10.1"
 license = "MIT"
 workspace = ".."
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 
 [features]
 formatted = []

diff --git a/gdnative-core/Cargo.toml b/gdnative-core/Cargo.toml
@@ -9,7 +9,7 @@ version = "0.10.1"
 license = "MIT"
 workspace = ".."
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 
 [features]
 default = []

diff --git a/gdnative-derive/Cargo.toml b/gdnative-derive/Cargo.toml
@@ -9,7 +9,7 @@ version = "0.10.1"
 license = "MIT"
 workspace = ".."
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 
 [lib]
 proc-macro = true

diff --git a/gdnative-sys/Cargo.toml b/gdnative-sys/Cargo.toml
@@ -10,7 +10,7 @@ build = "build.rs"
 license = "MIT"
 workspace = ".."
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 
 [dependencies]
 libc = "0.2"

diff --git a/gdnative/Cargo.toml b/gdnative/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT"
 workspace = ".."
 readme = "../README.md"
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 
 [features]
 # Public

diff --git a/gdnative/src/globalscope.rs b/gdnative/src/globalscope.rs
@@ -20,6 +20,7 @@
 //! [@GDScript]: https://docs.godotengine.org/en/stable/classes/class_@gdscript.html
 
 use crate::api::{Resource, ResourceLoader};
+use crate::core_types::NodePath;
 use crate::object::{memory::RefCounted, GodotObject, Ref, SubClass};
 
 #[doc(inline)]
@@ -50,14 +51,13 @@ pub use gdnative_core::globalscope::*;
 ///
 /// let scene = load::<PackedScene>("res://path/to/Main.tscn").unwrap();
 /// ```
-// TODO generalize parameter to `impl Into<NodePath>` once MSRV >= 1.63
 #[inline]
-pub fn load<T>(path: &str) -> Option<Ref<T>>
+pub fn load<T>(path: impl Into<NodePath>) -> Option<Ref<T>>
 where
     T: SubClass<Resource> + GodotObject<Memory = RefCounted>,
 {
     let type_hint = T::class_name();
     ResourceLoader::godot_singleton()
-        .load(path, type_hint, false)
+        .load(path.into(), type_hint, false)
         .and_then(|res| res.cast::<T>())
 }
diff --git a/impl/proc-macros/Cargo.toml b/impl/proc-macros/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.10.1"
 license = "MIT"
 workspace = "../.."
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 
 [lib]
 proc-macro = true

diff --git a/test/Cargo.toml b/test/Cargo.toml
@@ -3,7 +3,7 @@ name = "gdnative-test"
 version = "0.1.0"
 workspace = ".."
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.63"
 license = "MIT"
 publish = false