From 3d01f0268edae09d383d79f5c1941e8776e33f86 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 16:29:00 -0500 Subject: [PATCH] Bump godot from `301282f` to `aa7107a` (#385) * Bump godot from `301282f` to `aa7107a` Bumps [godot](https://github.com/godot-rust/gdext) from `301282f` to `aa7107a`. - [Commits](https://github.com/godot-rust/gdext/compare/301282f709691fab75c860ad33dbd8e430bd181c...aa7107a872c88822eb9262e2fe00b12c505f7423) --- updated-dependencies: - dependency-name: godot dependency-type: direct:production ... Signed-off-by: dependabot[bot] * Fix upgrade --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: d10sfan --- .github/workflows/build.yml | 4 ++-- .github/workflows/test.yml | 16 ++++++++-------- Cargo.lock | 32 ++++++++++++++++---------------- src/client.rs | 4 ++-- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1bea425..84a2357 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,8 @@ jobs: uses: actions/checkout@v4 - name: Install Rust run: | - rustup toolchain install 1.78.0 --profile minimal --no-self-update - rustup default 1.78.0 + rustup toolchain install 1.80.0 --profile minimal --no-self-update + rustup default 1.80.0 shell: bash - name: Use rust cache uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0cf9646..18b1ac3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,8 +10,8 @@ jobs: uses: actions/checkout@v4 - name: Install Rust run: | - rustup toolchain install 1.78.0 --profile minimal --no-self-update - rustup default 1.78.0 + rustup toolchain install 1.80.0 --profile minimal --no-self-update + rustup default 1.80.0 shell: bash - name: Use rust cache uses: Swatinem/rust-cache@v2 @@ -50,8 +50,8 @@ jobs: uses: actions/checkout@v4 - name: Install Rust run: | - rustup toolchain install 1.78.0 --profile default - rustup default 1.78.0 + rustup toolchain install 1.80.0 --profile default + rustup default 1.80.0 - name: Use rust cache uses: Swatinem/rust-cache@v2 - name: Clippy Run @@ -63,8 +63,8 @@ jobs: uses: actions/checkout@v4 - name: Install Rust run: | - rustup toolchain install 1.78.0 --profile default - rustup default 1.78.0 + rustup toolchain install 1.80.0 --profile default + rustup default 1.80.0 - name: fmt Run run: cargo fmt --all -- --check audit: @@ -74,8 +74,8 @@ jobs: uses: actions/checkout@v4 - name: Install Rust run: | - rustup toolchain install 1.78.0 --profile default - rustup default 1.78.0 + rustup toolchain install 1.80.0 --profile default + rustup default 1.80.0 - name: Use rust cache uses: Swatinem/rust-cache@v2 - name: Audit Run diff --git a/Cargo.lock b/Cargo.lock index 9fef46d..cc69492 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -537,8 +537,8 @@ checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9" [[package]] name = "godot" -version = "0.1.2" -source = "git+https://github.com/godot-rust/gdext?branch=master#301282f709691fab75c860ad33dbd8e430bd181c" +version = "0.1.3" +source = "git+https://github.com/godot-rust/gdext?branch=master#aa7107a872c88822eb9262e2fe00b12c505f7423" dependencies = [ "godot-core", "godot-macros", @@ -546,21 +546,21 @@ dependencies = [ [[package]] name = "godot-bindings" -version = "0.1.2" -source = "git+https://github.com/godot-rust/gdext?branch=master#301282f709691fab75c860ad33dbd8e430bd181c" +version = "0.1.3" +source = "git+https://github.com/godot-rust/gdext?branch=master#aa7107a872c88822eb9262e2fe00b12c505f7423" dependencies = [ "gdextension-api", ] [[package]] name = "godot-cell" -version = "0.1.2" -source = "git+https://github.com/godot-rust/gdext?branch=master#301282f709691fab75c860ad33dbd8e430bd181c" +version = "0.1.3" +source = "git+https://github.com/godot-rust/gdext?branch=master#aa7107a872c88822eb9262e2fe00b12c505f7423" [[package]] name = "godot-codegen" -version = "0.1.2" -source = "git+https://github.com/godot-rust/gdext?branch=master#301282f709691fab75c860ad33dbd8e430bd181c" +version = "0.1.3" +source = "git+https://github.com/godot-rust/gdext?branch=master#aa7107a872c88822eb9262e2fe00b12c505f7423" dependencies = [ "godot-bindings", "heck", @@ -572,8 +572,8 @@ dependencies = [ [[package]] name = "godot-core" -version = "0.1.2" -source = "git+https://github.com/godot-rust/gdext?branch=master#301282f709691fab75c860ad33dbd8e430bd181c" +version = "0.1.3" +source = "git+https://github.com/godot-rust/gdext?branch=master#aa7107a872c88822eb9262e2fe00b12c505f7423" dependencies = [ "glam", "godot-bindings", @@ -584,8 +584,8 @@ dependencies = [ [[package]] name = "godot-ffi" -version = "0.1.2" -source = "git+https://github.com/godot-rust/gdext?branch=master#301282f709691fab75c860ad33dbd8e430bd181c" +version = "0.1.3" +source = "git+https://github.com/godot-rust/gdext?branch=master#aa7107a872c88822eb9262e2fe00b12c505f7423" dependencies = [ "gensym", "godot-bindings", @@ -596,8 +596,8 @@ dependencies = [ [[package]] name = "godot-macros" -version = "0.1.2" -source = "git+https://github.com/godot-rust/gdext?branch=master#301282f709691fab75c860ad33dbd8e430bd181c" +version = "0.1.3" +source = "git+https://github.com/godot-rust/gdext?branch=master#aa7107a872c88822eb9262e2fe00b12c505f7423" dependencies = [ "godot-bindings", "proc-macro2", @@ -1291,9 +1291,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] diff --git a/src/client.rs b/src/client.rs index af2f565..b7e3704 100644 --- a/src/client.rs +++ b/src/client.rs @@ -14,7 +14,7 @@ use std::io::{Error, ErrorKind}; use std::sync::mpsc::channel; use tokio::runtime::Runtime; -use godot::engine::INode; +use godot::classes::{Node, Os}; use godot::prelude::*; use crate::command; @@ -130,7 +130,7 @@ impl LuxClient { let env_args: Vec = env::args().collect(); let args: Vec<&str> = env_args.iter().map(|a| a.as_str()).collect(); - let running_in_editor = !godot::engine::Os::singleton().has_feature("template".into()); + let running_in_editor = !Os::singleton().has_feature("template".into()); match command::main(running_in_editor) { Ok(()) => {}