diff options
| author | mat <git@matdoes.dev> | 2025-05-07 11:27:58 +0800 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2025-05-07 11:27:58 +0800 |
| commit | aa0256da102103eedc9897458dd81516962a80a3 (patch) | |
| tree | 9d01f879a7c75750acd8de0c308247c12bbeea9d /azalea-client/src | |
| parent | e9452032bfc95cb7ad4a8798b13648e164536cf1 (diff) | |
| download | azalea-drasl-aa0256da102103eedc9897458dd81516962a80a3.tar.xz | |
upgrade rust version and fix clippy warnings
Diffstat (limited to 'azalea-client/src')
| -rw-r--r-- | azalea-client/src/local_player.rs | 6 | ||||
| -rw-r--r-- | azalea-client/src/plugins/auto_reconnect.rs | 4 | ||||
| -rw-r--r-- | azalea-client/src/plugins/mining.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/azalea-client/src/local_player.rs b/azalea-client/src/local_player.rs index bf1609ab..26e08e9b 100644 --- a/azalea-client/src/local_player.rs +++ b/azalea-client/src/local_player.rs @@ -152,8 +152,10 @@ impl InstanceHolder { pub fn reset(&mut self) { let registries = self.instance.read().registries.clone(); - let mut new_instance = Instance::default(); - new_instance.registries = registries; + let new_instance = Instance { + registries, + ..Default::default() + }; self.instance = Arc::new(RwLock::new(new_instance)); self.partial_instance.write().reset(); diff --git a/azalea-client/src/plugins/auto_reconnect.rs b/azalea-client/src/plugins/auto_reconnect.rs index 280aaa65..52c6e94b 100644 --- a/azalea-client/src/plugins/auto_reconnect.rs +++ b/azalea-client/src/plugins/auto_reconnect.rs @@ -72,10 +72,8 @@ fn get_delay( ) -> Option<Duration> { if let Ok(c) = auto_reconnect_delay_query.get(entity) { Some(c.delay) - } else if let Some(r) = &auto_reconnect_delay_res { - Some(r.delay) } else { - None + auto_reconnect_delay_res.as_ref().map(|r| r.delay) } } diff --git a/azalea-client/src/plugins/mining.rs b/azalea-client/src/plugins/mining.rs index f2fb3361..7882ddc6 100644 --- a/azalea-client/src/plugins/mining.rs +++ b/azalea-client/src/plugins/mining.rs @@ -580,7 +580,7 @@ pub fn continue_mining_block( let instance = instance_lock.read(); let target_block_state = instance.get_block_state(&mining.pos).unwrap_or_default(); - println!("target_block_state: {:?}", target_block_state); + println!("target_block_state: {target_block_state:?}"); if target_block_state.is_air() { commands.entity(entity).remove::<Mining>(); |
