diff --git a/.github/workflows/full-ci.yml b/.github/workflows/full-ci.yml index 81cfd2ac8..db21c74ef 100644 --- a/.github/workflows/full-ci.yml +++ b/.github/workflows/full-ci.yml @@ -147,7 +147,7 @@ jobs: - name: linux os: ubuntu-22.04 - rust-toolchain: "1.80" + rust-toolchain: "1.85" rust-special: -msrv steps: diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml index ad5a9bd50..8a5f3abe2 100644 --- a/.github/workflows/update-docs.yml +++ b/.github/workflows/update-docs.yml @@ -19,7 +19,7 @@ on: env: # Keep this a variable for easy search&replace. - MSRV: 1.80 + MSRV: 1.85 jobs: notify-docs: diff --git a/examples/dodge-the-creeps/rust/Cargo.toml b/examples/dodge-the-creeps/rust/Cargo.toml index 061afa0b9..988c946d4 100644 --- a/examples/dodge-the-creeps/rust/Cargo.toml +++ b/examples/dodge-the-creeps/rust/Cargo.toml @@ -2,7 +2,7 @@ name = "dodge-the-creeps" version = "0.1.0" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" publish = false diff --git a/examples/hot-reload/rust/Cargo.toml b/examples/hot-reload/rust/Cargo.toml index f0de2225d..394e504a4 100644 --- a/examples/hot-reload/rust/Cargo.toml +++ b/examples/hot-reload/rust/Cargo.toml @@ -2,7 +2,7 @@ name = "hot-reload" version = "0.1.0" edition = "2021" -rust-version = "1.70" +rust-version = "1.85" license = "MPL-2.0" publish = false diff --git a/godot-bindings/Cargo.toml b/godot-bindings/Cargo.toml index 7a2d36794..7725402d9 100644 --- a/godot-bindings/Cargo.toml +++ b/godot-bindings/Cargo.toml @@ -2,7 +2,7 @@ name = "godot-bindings" version = "0.2.4" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" keywords = ["gamedev", "godot", "engine", "ffi", "sys"] categories = ["game-engines", "graphics"] diff --git a/godot-cell/Cargo.toml b/godot-cell/Cargo.toml index f61647bcd..b210e6950 100644 --- a/godot-cell/Cargo.toml +++ b/godot-cell/Cargo.toml @@ -2,7 +2,7 @@ name = "godot-cell" version = "0.2.4" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" keywords = ["gamedev", "godot", "engine", "ffi"] categories = ["game-engines", "graphics"] diff --git a/godot-codegen/Cargo.toml b/godot-codegen/Cargo.toml index 5f35ec9a7..7f79095c0 100644 --- a/godot-codegen/Cargo.toml +++ b/godot-codegen/Cargo.toml @@ -2,7 +2,7 @@ name = "godot-codegen" version = "0.2.4" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" keywords = ["gamedev", "godot", "engine", "codegen"] categories = ["game-engines", "graphics"] diff --git a/godot-core/Cargo.toml b/godot-core/Cargo.toml index 41b3da290..c63f227ce 100644 --- a/godot-core/Cargo.toml +++ b/godot-core/Cargo.toml @@ -2,7 +2,7 @@ name = "godot-core" version = "0.2.4" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" keywords = ["gamedev", "godot", "engine", "2d", "3d"] # possibly: "ffi" categories = ["game-engines", "graphics"] diff --git a/godot-core/src/meta/args/ref_arg.rs b/godot-core/src/meta/args/ref_arg.rs index 49042cba3..08bcf6444 100644 --- a/godot-core/src/meta/args/ref_arg.rs +++ b/godot-core/src/meta/args/ref_arg.rs @@ -193,6 +193,6 @@ where } fn is_null(&self) -> bool { - self.shared_ref.map_or(true, T::is_null) + self.shared_ref.is_none_or(T::is_null) } } diff --git a/godot-core/src/obj/script.rs b/godot-core/src/obj/script.rs index 0bcd1d179..ed6db6aad 100644 --- a/godot-core/src/obj/script.rs +++ b/godot-core/src/obj/script.rs @@ -362,7 +362,7 @@ where if object_script_variant .object_id() - .map_or(true, |instance_id| instance_id != script.instance_id()) + .is_none_or(|instance_id| instance_id != script.instance_id()) { return false; } diff --git a/godot-ffi/Cargo.toml b/godot-ffi/Cargo.toml index f47b73514..70900f2e7 100644 --- a/godot-ffi/Cargo.toml +++ b/godot-ffi/Cargo.toml @@ -2,7 +2,7 @@ name = "godot-ffi" version = "0.2.4" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" keywords = ["gamedev", "godot", "engine", "ffi"] categories = ["game-engines", "graphics"] diff --git a/godot-macros/Cargo.toml b/godot-macros/Cargo.toml index b97c89b63..f324edc6d 100644 --- a/godot-macros/Cargo.toml +++ b/godot-macros/Cargo.toml @@ -2,7 +2,7 @@ name = "godot-macros" version = "0.2.4" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" keywords = ["gamedev", "godot", "engine", "derive", "macro"] categories = ["game-engines", "graphics"] diff --git a/godot-macros/src/itest.rs b/godot-macros/src/itest.rs index 6c0bb06bb..1bfd6f0b7 100644 --- a/godot-macros/src/itest.rs +++ b/godot-macros/src/itest.rs @@ -67,7 +67,7 @@ pub fn attribute_itest(input_item: venial::Item) -> ParseResult { .return_ty .as_ref() .and_then(extract_typename) - .map_or(true, |segment| segment.ident != "TaskHandle") + .is_none_or(|segment| segment.ident != "TaskHandle") { return bad_async_signature(&func); } diff --git a/godot/Cargo.toml b/godot/Cargo.toml index 2ce024737..bf438a4bc 100644 --- a/godot/Cargo.toml +++ b/godot/Cargo.toml @@ -2,7 +2,7 @@ name = "godot" version = "0.2.4" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" keywords = ["gamedev", "godot", "engine", "2d", "3d"] # possibly: "ffi" categories = ["game-engines", "graphics"] diff --git a/itest/repo-tweak/Cargo.toml b/itest/repo-tweak/Cargo.toml index 977e7b010..7ebf570dc 100644 --- a/itest/repo-tweak/Cargo.toml +++ b/itest/repo-tweak/Cargo.toml @@ -2,7 +2,7 @@ name = "repo-tweak" version = "0.1.0" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" publish = false diff --git a/itest/rust/Cargo.toml b/itest/rust/Cargo.toml index 28516f1f8..92230c43a 100644 --- a/itest/rust/Cargo.toml +++ b/itest/rust/Cargo.toml @@ -2,7 +2,7 @@ name = "itest" version = "0.0.0" edition = "2021" -rust-version = "1.80" +rust-version = "1.85" license = "MPL-2.0" publish = false