diff options
| author | Shayne Hartford <shaybox@shaybox.com> | 2024-11-23 03:29:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-23 02:29:30 -0600 |
| commit | dfdc3144b61b6750ad62fb493b7c00c6c820c90b (patch) | |
| tree | 0cca5bcea62b3562152944b278c494401531d4d7 /azalea-protocol | |
| parent | e443c5d76e706132ab554e97513d2b159f4ab0a1 (diff) | |
| download | azalea-drasl-dfdc3144b61b6750ad62fb493b7c00c6c820c90b.tar.xz | |
Update and merge the dependencies (#187)
* Add rust rover to .gitignore
* Fold dependency feature lists
* Sort dependencies alphabetically
* Update dependencies
* Upgrade dependencies
* Comment out unused dependencies
* Nightly is broken right now :)
* Fix conflict with derive_more
* cargo autoinherit to merge dependencies
* Fix clippy lints
Diffstat (limited to 'azalea-protocol')
| -rw-r--r-- | azalea-protocol/Cargo.toml | 65 | ||||
| -rw-r--r-- | azalea-protocol/azalea-protocol-macros/Cargo.toml | 6 | ||||
| -rw-r--r-- | azalea-protocol/src/lib.rs | 2 | ||||
| -rwxr-xr-x | azalea-protocol/src/read.rs | 8 |
4 files changed, 36 insertions, 45 deletions
diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml index 9a6b328c..1e32d71d 100644 --- a/azalea-protocol/Cargo.toml +++ b/azalea-protocol/Cargo.toml @@ -9,46 +9,37 @@ version = "0.10.3+mc1.21.1" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -simdnbt = "0.6" -async-recursion = "1.1.1" +async-recursion = { workspace = true } azalea-auth = { path = "../azalea-auth", version = "0.10.0" } azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" } -azalea-brigadier = { path = "../azalea-brigadier", version = "0.10.0", features = [ - "azalea-buf", -] } +azalea-brigadier = { path = "../azalea-brigadier", version = "0.10.0", features = ["azalea-buf"] } azalea-buf = { path = "../azalea-buf", version = "0.10.0" } -azalea-chat = { path = "../azalea-chat", version = "0.10.0", features = [ - "numbers", - "azalea-buf", -] } -azalea-core = { path = "../azalea-core", optional = true, version = "0.10.0", features = [ - "serde", -] } +azalea-chat = { path = "../azalea-chat", version = "0.10.0", features = ["numbers", "azalea-buf"] } +azalea-core = { path = "../azalea-core", optional = true, version = "0.10.0", features = ["serde"] } azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" } +azalea-entity = { version = "0.10.0", path = "../azalea-entity" } +azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "0.10.0" } azalea-registry = { path = "../azalea-registry", version = "0.10.0" } azalea-world = { path = "../azalea-world", version = "0.10.0" } -bevy_ecs = { version = "0.13.0", default-features = false } -byteorder = "^1.5.0" -bytes = "^1.6.0" -flate2 = "1.0.30" -futures = "0.3.30" -futures-lite = "2.3.0" -futures-util = "0.3.30" -tracing = "0.1.40" -serde = { version = "^1.0", features = ["serde_derive"] } -serde_json = "^1.0.120" -thiserror = "1.0.61" -tokio = { version = "^1.38.0", features = ["io-util", "net", "macros"] } -tokio-util = { version = "0.7.11", features = ["codec"] } -trust-dns-resolver = { version = "^0.23.2", default-features = false, features = [ - "tokio-runtime", -] } -uuid = "1.9.1" -log = "0.4.22" -azalea-entity = { version = "0.10.0", path = "../azalea-entity" } -azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" } -socks5-impl = "0.5.14" +bevy_ecs = { workspace = true } +#byteorder = { workspace = true } +bytes = { workspace = true } +flate2 = { workspace = true } +futures = { workspace = true } +futures-lite = { workspace = true } +#futures-util = { workspace = true } +log = { workspace = true } +serde = { workspace = true, features = ["serde_derive"] } +serde_json = { workspace = true } +simdnbt = { workspace = true } +socks5-impl = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["io-util", "net", "macros"] } +tokio-util = { workspace = true, features = ["codec"] } +tracing = { workspace = true } +trust-dns-resolver = { workspace = true, features = ["tokio-runtime"] } +uuid = { workspace = true } [features] connecting = [] @@ -56,7 +47,7 @@ default = ["packets"] packets = ["connecting", "dep:azalea-core"] [dev-dependencies] -anyhow = "^1.0.86" -tracing = "^0.1.40" -tracing-subscriber = "^0.3.18" -once_cell = "1.19.0" +anyhow = { workspace = true } +once_cell = { workspace = true } +tracing = { workspace = true } +tracing-subscriber = { workspace = true } diff --git a/azalea-protocol/azalea-protocol-macros/Cargo.toml b/azalea-protocol/azalea-protocol-macros/Cargo.toml index 4a4de9a5..4bc8c360 100644 --- a/azalea-protocol/azalea-protocol-macros/Cargo.toml +++ b/azalea-protocol/azalea-protocol-macros/Cargo.toml @@ -11,6 +11,6 @@ proc-macro = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -proc-macro2 = "^1.0.86" -quote = "^1.0.36" -syn = "^2.0.68" +proc-macro2 = { workspace = true } +quote = { workspace = true } +syn = { workspace = true } diff --git a/azalea-protocol/src/lib.rs b/azalea-protocol/src/lib.rs index 0b2db1cf..1bbb80d4 100644 --- a/azalea-protocol/src/lib.rs +++ b/azalea-protocol/src/lib.rs @@ -40,7 +40,7 @@ pub struct ServerAddress { pub port: u16, } -impl<'a> TryFrom<&'a 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 558e1072..67ea9aee 100755 --- a/azalea-protocol/src/read.rs +++ b/azalea-protocol/src/read.rs @@ -209,8 +209,8 @@ pub fn compression_decoder( /// The current protocol state must be passed as a generic. /// /// For the non-waiting version, see [`try_read_packet`]. -pub async fn read_packet<'a, P: ProtocolPacket + Debug, R>( - stream: &'a mut R, +pub async fn read_packet<P: ProtocolPacket + Debug, R>( + stream: &mut R, buffer: &mut BytesMut, compression_threshold: Option<u32>, cipher: &mut Option<Aes128CfbDec>, @@ -242,8 +242,8 @@ where Ok(Some(packet)) } -pub async fn read_raw_packet<'a, R>( - stream: &'a mut R, +pub async fn read_raw_packet<R>( + stream: &mut R, buffer: &mut BytesMut, compression_threshold: Option<u32>, // this has to be a &mut Option<T> instead of an Option<&mut T> because |
