fix crash, format and lint

.github/workflows/android-build.yml

@@ -29,7 +29,7 @@ jobs:
     - name: Set up Rust
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.77.2
+        toolchain: 1.78
         override: true
         components: clippy, rustfmt
 

.github/workflows/ci.yml

@@ -90,7 +90,7 @@ jobs:
       - name: Install stable toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.76
+          toolchain: 1.78
           override: true
           components: llvm-tools-preview
 
@@ -170,7 +170,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.76
+          toolchain: 1.78
           override: true
 
       - name: Set up cargo cache

godot/src/decentraland_components/avatar/avatar.gd

@@ -59,7 +59,7 @@ func _ready():
 	label_3d_name.billboard = billboard_mode
 
 	emote_controller = AvatarEmoteController.new(self, animation_player, animation_tree)
-	# TODO
+	# TODO: uncomment this line before finishing bump to 4.3, FIX
 	# body_shape_skeleton_3d.bone_pose_changed.connect(self._attach_point_bone_pose_changed)
 
 	avatar_modifier_area_detector.set_avatar_modifier_area.connect(
@@ -248,7 +248,8 @@ func try_to_set_body_shape(body_shape_hash):
 		var new_child = child.duplicate()
 		new_child.name = "bodyshape_" + child.name.to_lower()
 
-		new_child.add_child(body_shape.get_node("ResourceLocker").duplicate())
+		var resource_locker = body_shape.get_node("ResourceLocker")
+		new_child.add_child(resource_locker.duplicate())
 		body_shape_skeleton_3d.add_child(new_child)
 
 	_add_attach_points()

lib/Cargo.toml

@@ -85,8 +85,4 @@ enable_inspector = ["use_deno", "dep:fastwebsockets", "dep:hyper1"]
 [build-dependencies]
 webrtc-sys-build = { git = "https://github.com/livekit/rust-sdks", optional = true, rev="8b276f9d4b98437a139e1cbe41cfda1332ce1120" }
 prost-build = "0.11.8"
-chrono = "0.4.31"
-
-[patch."https://github.com/godot-rust/godot4-prebuilt".godot4-prebuilt]
-git = "https://github.com//godot-rust/godot4-prebuilt"
-rev = "bc1e77856d181c14c59d2a5cb6a7e138ea5a2b39"
+chrono = "0.4.31"

lib/src/auth/dcl_player_identity.rs

@@ -327,17 +327,17 @@ impl DclPlayerIdentity {
         };
 
         if let Some(CurrentWallet::Local { wallet: _, keys }) = &self.wallet {
-            dict.insert(
+            let _ = dict.insert(
                 "local_wallet",
                 PackedByteArray::from_iter(keys.iter().cloned()).to_variant(),
             );
         }
 
-        dict.insert("magic_auth", self.magic_auth.to_variant());
+        let _ = dict.insert("magic_auth", self.magic_auth.to_variant());
 
-        dict.insert("account_address", self.get_address_str().to_variant());
-        dict.insert("chain_id", chain_id.to_variant());
-        dict.insert(
+        let _ = dict.insert("account_address", self.get_address_str().to_variant());
+        let _ = dict.insert("chain_id", chain_id.to_variant());
+        let _ = dict.insert(
             "ephemeral_auth_chain",
             serde_json::to_string(&self.ephemeral_auth_chain.as_ref().unwrap())
                 .expect("serialize ephemeral auth chain")

lib/src/avatars/avatar_type.rs

@@ -90,9 +90,9 @@ impl DclAvatarWireFormat {
 
         for (i, emote) in DEFAULT_EMOTES.iter().enumerate() {
             if let Some(emote) = used_emotes.iter().find(|e| e.slot == i as u32) {
-                emotes.set(i, GString::from(emote.urn.as_str()));
+                emotes[i] = GString::from(emote.urn.as_str());
             } else {
-                emotes.set(i, GString::from(*emote));
+                emotes[i] = GString::from(*emote);
             }
         }
         emotes

lib/src/comms/communication_manager.rs

@@ -285,7 +285,7 @@ impl CommunicationManager {
     }
 
     #[func]
-    fn _on_profile_changed(&mut self) {
+    fn _on_profile_changed(&mut self, _: Variant) {
         self.base_mut()
             .call_deferred("_on_update_profile".into(), &[]);
     }

lib/src/godot_classes/dcl_avatar.rs

@@ -107,7 +107,7 @@ impl DclAvatar {
         self.lerp_state.factor = 0.0;
         self.lerp_state.initial_velocity_y = y_velocity;
 
-        let initial_position = self.lerp_state.initial_position.clone();
+        let initial_position = self.lerp_state.initial_position;
 
         // TODO: check euler order
         self.base_mut()

lib/src/godot_classes/resource_locker.rs

@@ -1,29 +1,14 @@
 use godot::{engine::node::InternalMode, prelude::*};
 
 #[derive(GodotClass)]
-#[class(base=Node)]
+#[class(init, base=Node)]
 pub struct ResourceLocker {
     #[export]
     reference: Gd<Resource>,
 
     base: Base<Node>,
 }
 
-#[godot_api]
-impl INode for ResourceLocker {
-    fn init(mut base: Base<Node>) -> Self {
-        let reference = Resource::new_gd();
-
-        // TODO: set meta
-        // base.set_name("ResourceLocker".to_godot());
-        // base.set_meta(
-        //     StringName::from("instance_id"),
-        //     reference.instance_id().to_variant(),
-        // );
-        Self { base, reference }
-    }
-}
-
 #[godot_api]
 impl ResourceLocker {
     #[func]
@@ -33,7 +18,14 @@ impl ResourceLocker {
             return;
         }
 
-        let resource_locker = ResourceLocker::new_alloc();
+        let mut resource_locker = Gd::from_init_fn(|base| {
+            let reference = Resource::new_gd();
+            ResourceLocker { reference, base }
+        });
+
+        let instance_id = resource_locker.bind().reference.instance_id().to_variant();
+        resource_locker.set_name("ResourceLocker".to_godot());
+        resource_locker.set_meta(StringName::from("instance_id"), instance_id);
 
         node.add_child_ex(resource_locker.upcast())
             .internal(InternalMode::FRONT)

lib/src/http_request/request_response.rs

@@ -134,7 +134,6 @@ impl RequestResponse {
                     Variant::nil()
                 }
             }
-            _ => Variant::nil(),
         }
     }
 }

lib/src/scene_runner/components/ui/ui_background.rs

@@ -1,7 +1,4 @@
-use godot::{
-    obj::{NewAlloc, UserClass},
-    prelude::Gd,
-};
+use godot::{obj::NewAlloc, prelude::Gd};
 
 use crate::{
     dcl::{

lib/src/scene_runner/components/ui/ui_dropdown.rs

@@ -1,7 +1,4 @@
-use godot::{
-    obj::{NewAlloc, UserClass},
-    prelude::Gd,
-};
+use godot::{obj::NewAlloc, prelude::Gd};
 
 use crate::{
     dcl::{

lib/src/scene_runner/components/ui/ui_input.rs

@@ -1,7 +1,4 @@
-use godot::{
-    obj::{NewAlloc, UserClass},
-    prelude::Gd,
-};
+use godot::{obj::NewAlloc, prelude::Gd};
 
 use crate::{
     dcl::{

lib/src/scene_runner/components/ui/ui_text.rs

@@ -1,7 +1,4 @@
-use godot::{
-    obj::{NewAlloc, UserClass},
-    prelude::Gd,
-};
+use godot::{obj::NewAlloc, prelude::Gd};
 
 use crate::{
     dcl::{

lib/src/scene_runner/godot_dcl_scene.rs

@@ -9,7 +9,7 @@ use crate::{
     },
     realm::scene_definition::SceneEntityDefinition,
 };
-use godot::{engine::Script, prelude::*};
+use godot::prelude::*;
 use std::{
     cell::RefCell,
     collections::{HashMap, HashSet},
@@ -185,11 +185,11 @@ impl GodotDclScene {
 
         let godot_entity_node = self.entities.get_mut(entity).unwrap();
         if godot_entity_node.base_3d.is_none() {
-            let mut new_node_3d = DclNodeEntity3d::new_alloc(*entity);
+            let new_node_3d = DclNodeEntity3d::new_alloc(*entity);
             self.root_node_3d.add_child(new_node_3d.clone().upcast());
 
             if entity == &SceneEntityId::PLAYER || entity == &SceneEntityId::CAMERA {
-                // TODO
+                // TODO FIXME loading script and instantiate to cast to Node
 
                 // let mut player_collider_filter = godot::engine::load::<Script>(
                 //     "res://src/decentraland_components/player_collider_filter.gd",

lib/src/scene_runner/rpc_calls/mod.rs

@@ -1,10 +1,7 @@
 mod handle_restricted_actions;
 mod portables;
 
-use godot::{
-    builtin::meta::ToGodot,
-    obj::{NewGd, UserClass},
-};
+use godot::{builtin::meta::ToGodot, obj::NewGd};
 
 use crate::{
     content::content_mapping::DclContentMappingAndUrl,

lib/src/scene_runner/scene.rs

@@ -4,10 +4,7 @@ use std::{
     time::Instant,
 };
 
-use godot::{
-    obj::{NewAlloc, UserClass},
-    prelude::Gd,
-};
+use godot::{obj::NewAlloc, prelude::Gd};
 
 use crate::{
     content::content_mapping::{ContentMappingAndUrl, ContentMappingAndUrlRef},

src/copy_files.rs

@@ -73,12 +73,10 @@ pub fn copy_library(debug_mode: bool, link_libs: bool) -> Result<(), anyhow::Err
     copy_if_modified(source_file, destination_file, link_libs)?;
 
     if debug_mode && os == "windows" {
-        let source_file = adjust_canonicalization(
-            fs::canonicalize(source_folder)?.join("dclgodot.pdb".to_string()),
-        );
-        let destination_file = adjust_canonicalization(
-            fs::canonicalize(lib_folder.as_str())?.join("dclgodot.pdb".to_string()),
-        );
+        let source_file =
+            adjust_canonicalization(fs::canonicalize(source_folder)?.join("dclgodot.pdb"));
+        let destination_file =
+            adjust_canonicalization(fs::canonicalize(lib_folder.as_str())?.join("dclgodot.pdb"));
         copy_if_modified(source_file, destination_file, link_libs)?;
     }
 

src/main.rs

@@ -132,7 +132,7 @@ fn main() -> Result<(), anyhow::Error> {
         ("run", sm) => {
             let mut build_args: Vec<&str> = sm
                 .values_of("build-args")
-                .map(|v| v.map(|it| it.into()).collect())
+                .map(|v| v.collect())
                 .unwrap_or_default();
 
             if sm.is_present("resource-tracking") {

src/run.rs

@@ -22,11 +22,7 @@ pub fn run(
     extras: Vec<String>,
     with_build_envs: Option<HashMap<String, String>>,
 ) -> Result<(), anyhow::Error> {
-    let with_build_envs = match with_build_envs {
-        Some(vars) => vars,
-        None => HashMap::new(),
-    };
-
+    let with_build_envs = with_build_envs.unwrap_or_default();
     let program = adjust_canonicalization(
         std::fs::canonicalize(format!(
             "{}godot/{}",