Skip to content

Bump MSRV from 1.80 to 1.85 #1076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/full-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ jobs:

- name: linux
os: ubuntu-22.04
rust-toolchain: "1.80"
rust-toolchain: "1.85"
rust-special: -msrv

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

env:
# Keep this a variable for easy search&replace.
MSRV: 1.80
MSRV: 1.85

jobs:
notify-docs:
Expand Down
2 changes: 1 addition & 1 deletion examples/dodge-the-creeps/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/hot-reload/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion godot-bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion godot-cell/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion godot-codegen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion godot-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion godot-core/src/meta/args/ref_arg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
2 changes: 1 addition & 1 deletion godot-core/src/obj/script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion godot-ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion godot-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion godot-macros/src/itest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pub fn attribute_itest(input_item: venial::Item) -> ParseResult<TokenStream> {
.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);
}
Expand Down
2 changes: 1 addition & 1 deletion godot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion itest/repo-tweak/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion itest/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading