From 6379035b852f1b619565d27f5cee3b93042c2312 Mon Sep 17 00:00:00 2001
From: EightFactorial <29801334+EightFactorial@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:31:22 -0800
Subject: Update Bevy and migrate to workspace dependencies and package
 attributes (#181)

* Use workspace `Cargo.toml` for dependencies and package atributes

* Fix a couple clippy warnings

* Update bevy, update build script, move deps to workspace, and fix clippy warnings

* Remove carrots from crate versions
The default behavior is the same

* Remove unused dependencies
Compiles and all tests pass, so it should be fine

* Update codegen to use `std::sync::LazyLock` instead of `once_cell::sync::Lazy`

* Update Bevy to `0.15.0-rc.3`
Surprisingly little needed to be changed

* Update to bevy 0.15.0

* Fix leftover merge issues

* Clarify the reason the swarm can't connect

* Fix duplicate lint, remove `log` dependency
---
 azalea-protocol/src/lib.rs  | 2 +-
 azalea-protocol/src/read.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'azalea-protocol/src')

diff --git a/azalea-protocol/src/lib.rs b/azalea-protocol/src/lib.rs
index fb271433..be706ebe 100644
--- a/azalea-protocol/src/lib.rs
+++ b/azalea-protocol/src/lib.rs
@@ -41,7 +41,7 @@ pub struct ServerAddress {
     pub port: u16,
 }
 
-impl TryFrom<&'_ str> for ServerAddress {
+impl TryFrom<&str> for ServerAddress {
     type Error = String;
 
     /// Convert a Minecraft server address (host:port, the port is optional) to
diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs
index 3e333e52..8569ca73 100755
--- a/azalea-protocol/src/read.rs
+++ b/azalea-protocol/src/read.rs
@@ -350,7 +350,7 @@ where
             .map_err(ReadPacketError::from)?;
     }
 
-    if log::log_enabled!(log::Level::Trace) {
+    if tracing::enabled!(tracing::Level::TRACE) {
         const DO_NOT_CUT_OFF_PACKET_LOGS: bool = false;
 
         let buf_string: String = {
-- 
cgit v1.2.3