Skip to content

Commit 8af6d51

Browse files
mat-1EightFactorial
mat-1
authored and
EightFactorial
committed
upgrade to simdnbt 0.6 (#160)
1 parent 38eab50 commit 8af6d51

File tree

30 files changed

+507
-490
lines changed

30 files changed

+507
-490
lines changed

‎Cargo.lock

Lines changed: 253 additions & 216 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎azalea-auth/Cargo.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ version = "0.10.1"
1111
[dependencies]
1212
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
1313
azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" }
14-
base64 = "0.22.0"
14+
base64 = "0.22.1"
1515
chrono = { version = "0.4.38", default-features = false, features = ["serde"] }
1616
tracing = "0.1.40"
17-
num-bigint = "0.4.4"
17+
num-bigint = "0.4.6"
1818
once_cell = "1.19.0"
19-
reqwest = { version = "0.12.4", default-features = false, features = [
19+
reqwest = { version = "0.12.5", default-features = false, features = [
2020
"json",
2121
"rustls-tls",
2222
] }
2323
rsa = "0.9.6"
24-
serde = { version = "1.0.198", features = ["derive"] }
25-
serde_json = "1.0.116"
26-
thiserror = "1.0.59"
27-
tokio = { version = "1.37.0", features = ["fs"] }
28-
uuid = { version = "1.8.0", features = ["serde", "v3"] }
24+
serde = { version = "1.0.203", features = ["derive"] }
25+
serde_json = "1.0.120"
26+
thiserror = "1.0.61"
27+
tokio = { version = "1.38.0", features = ["fs"] }
28+
uuid = { version = "1.9.1", features = ["serde", "v3"] }
2929
md-5 = "0.10.6"
3030

3131
[dev-dependencies]
3232
env_logger = "0.11.3"
33-
tokio = { version = "1.37.0", features = ["full"] }
33+
tokio = { version = "1.38.0", features = ["full"] }

‎azalea-block/azalea-block-macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ proc-macro = true
1212
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313

1414
[dependencies]
15-
proc-macro2 = "1.0.81"
15+
proc-macro2 = "1.0.86"
1616
quote = "1.0.36"
17-
syn = "2.0.60"
17+
syn = "2.0.68"

‎azalea-block/azalea-block-macros/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
829829
fn name_to_ident(name: &str) -> Ident {
830830
let ident_str = match name {
831831
"type" => "kind",
832-
_ => &name,
832+
_ => name,
833833
};
834834
Ident::new(ident_str, proc_macro2::Span::call_site())
835835
}

‎azalea-brigadier/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bevy_ecs = "0.13.0"
1515
[dependencies]
1616
azalea-buf = { path = "../azalea-buf", version = "0.10.0", optional = true }
1717
azalea-chat = { path = "../azalea-chat", version = "0.10.0", optional = true }
18-
parking_lot = "0.12.1"
18+
parking_lot = "0.12.3"
1919

2020
[features]
2121
azalea-buf = ["dep:azalea-buf", "dep:azalea-chat", "azalea-chat/azalea-buf"]

‎azalea-buf/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ version = "0.10.2"
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
simdnbt = { version = "0.5", git = "https://github.com/azalea-rs/simdnbt" }
12+
simdnbt = "0.6"
1313
azalea-buf-macros = { path = "./azalea-buf-macros", version = "0.10.0" }
1414
byteorder = "^1.5.0"
1515
tracing = "0.1.40"
1616
serde_json = { version = "^1.0", optional = true }
17-
thiserror = "1.0.59"
18-
uuid = "^1.8.0"
17+
thiserror = "1.0.61"
18+
uuid = "^1.9.1"
1919

2020
[features]
2121
serde_json = ["dep:serde_json"]

‎azalea-buf/azalea-buf-macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ proc-macro = true
1111
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1212

1313
[dependencies]
14-
proc-macro2 = "^1.0.81"
14+
proc-macro2 = "^1.0.86"
1515
quote = "^1.0.36"
16-
syn = { version = "^2.0.60", features = ["extra-traits"] }
16+
syn = { version = "^2.0.68", features = ["extra-traits"] }

‎azalea-buf/src/read.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,13 +344,13 @@ impl<T: McBufReadable, const N: usize> McBufReadable for [T; N] {
344344

345345
impl McBufReadable for simdnbt::owned::NbtTag {
346346
fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
347-
Ok(simdnbt::owned::NbtTag::read(buf)?)
347+
Ok(simdnbt::owned::read_tag(buf)?)
348348
}
349349
}
350350

351351
impl McBufReadable for simdnbt::owned::NbtCompound {
352352
fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
353-
match simdnbt::owned::NbtTag::read(buf)? {
353+
match simdnbt::owned::read_tag(buf)? {
354354
simdnbt::owned::NbtTag::Compound(compound) => Ok(compound),
355355
_ => Err(BufReadError::Custom("Expected compound tag".to_string())),
356356
}

‎azalea-chat/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ azalea-buf = { path = "../azalea-buf", features = [
1919
"serde_json",
2020
], version = "0.10.0", optional = true }
2121
azalea-language = { path = "../azalea-language", version = "0.10.0" }
22-
simdnbt = { version = "0.5", optional = true, git = "https://github.com/azalea-rs/simdnbt" }
22+
simdnbt = { version = "0.6", optional = true }
2323
tracing = "0.1.40"
2424
once_cell = "1.19.0"
2525
serde = { version = "^1.0", features = ["derive"] }
26-
serde_json = "^1.0.116"
26+
serde_json = "^1.0.120"
2727
azalea-registry = { path = "../azalea-registry", version = "0.10.0", optional = true }

‎azalea-chat/src/component.rs

Lines changed: 147 additions & 164 deletions
Large diffs are not rendered by default.

‎azalea-chat/src/style.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ impl Style {
581581
#[cfg(feature = "simdnbt")]
582582
impl simdnbt::Deserialize for Style {
583583
fn from_compound(
584-
compound: &simdnbt::borrow::NbtCompound,
584+
compound: simdnbt::borrow::NbtCompound,
585585
) -> Result<Self, simdnbt::DeserializeError> {
586586
let bold = compound.byte("bold").map(|v| v != 0);
587587
let italic = compound.byte("italic").map(|v| v != 0);

‎azalea-client/Cargo.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ version = "0.10.2"
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
simdnbt = { version = "0.5", git = "https://github.com/azalea-rs/simdnbt" }
13-
reqwest = { version = "0.12.4", default-features = false }
14-
anyhow = "1.0.82"
12+
simdnbt = "0.6"
13+
reqwest = { version = "0.12.5", default-features = false }
14+
anyhow = "1.0.86"
1515
async-trait = "0.1.80"
1616
azalea-auth = { path = "../azalea-auth", version = "0.10.0" }
1717
azalea-block = { path = "../azalea-block", version = "0.10.0" }
@@ -23,23 +23,23 @@ azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
2323
azalea-protocol = { path = "../azalea-protocol", version = "0.10.0" }
2424
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
2525
azalea-world = { path = "../azalea-world", version = "0.10.0" }
26-
bevy_app = "0.13.2"
27-
bevy_ecs = "0.13.2"
28-
bevy_log = { version = "0.13.2", optional = true }
29-
bevy_tasks = "0.13.2"
30-
bevy_time = "0.13.2"
31-
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
26+
bevy_app = "0.13.0"
27+
bevy_ecs = "0.13.0"
28+
bevy_log = { version = "0.13.0", optional = true }
29+
bevy_tasks = "0.13.0"
30+
bevy_time = "0.13.0"
31+
derive_more = { version = "0.99.18", features = ["deref", "deref_mut"] }
3232
futures = "0.3.30"
3333
tracing = "0.1.40"
3434
nohash-hasher = "0.2.0"
3535
once_cell = "1.19.0"
36-
parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
37-
regex = "1.10.4"
38-
thiserror = "^1.0.59"
39-
tokio = { version = "^1.37.0", features = ["sync"] }
40-
uuid = "^1.8.0"
41-
serde_json = "1.0.116"
42-
serde = "1.0.198"
36+
parking_lot = { version = "^0.12.3", features = ["deadlock_detection"] }
37+
regex = "1.10.5"
38+
thiserror = "^1.0.61"
39+
tokio = { version = "^1.38.0", features = ["sync"] }
40+
uuid = "^1.9.1"
41+
serde_json = "1.0.120"
42+
serde = "1.0.203"
4343
minecraft_folder_path = "0.1.2"
4444
azalea-entity = { version = "0.10.0", path = "../azalea-entity" }
4545
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }

‎azalea-core/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ version = "0.10.2"
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
simdnbt = { version = "0.5", git = "https://github.com/azalea-rs/simdnbt" }
12+
simdnbt = "0.6"
1313
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
1414
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
15-
bevy_ecs = { version = "0.13.2", default-features = false, optional = true }
15+
bevy_ecs = { version = "0.13.0", default-features = false, optional = true }
1616
nohash-hasher = "0.2.0"
17-
num-traits = "0.2.18"
17+
num-traits = "0.2.19"
1818
serde = { version = "^1.0", optional = true }
19-
uuid = "^1.8.0"
20-
serde_json = "^1.0.116"
19+
uuid = "^1.9.1"
20+
serde_json = "^1.0.120"
2121
tracing = "0.1.40"
2222

2323
[features]

‎azalea-core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#![doc = include_str!("../README.md")]
2-
#![feature(lazy_cell)]
32
#![feature(trait_upcasting)]
43
#![allow(incomplete_features)]
54
#![feature(generic_const_exprs)]

‎azalea-core/src/registry_holder.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl RegistryHolder {
5353
value.write(&mut nbt_bytes);
5454
let nbt_borrow_compound =
5555
simdnbt::borrow::read_compound(&mut Cursor::new(&nbt_bytes)).ok()?;
56-
let value = match T::from_compound(&nbt_borrow_compound) {
56+
let value = match T::from_compound((&nbt_borrow_compound).into()) {
5757
Ok(value) => value,
5858
Err(err) => {
5959
return Some(Err(err));
@@ -182,7 +182,7 @@ pub enum MonsterSpawnLightLevel {
182182
}
183183

184184
impl FromNbtTag for MonsterSpawnLightLevel {
185-
fn from_nbt_tag(tag: &simdnbt::borrow::NbtTag) -> Option<Self> {
185+
fn from_nbt_tag(tag: simdnbt::borrow::NbtTag) -> Option<Self> {
186186
if let Some(value) = tag.int() {
187187
Some(Self::Simple(value as u32))
188188
} else if let Some(value) = tag.compound() {
@@ -240,7 +240,7 @@ pub enum BiomePrecipitation {
240240
Snow,
241241
}
242242
impl FromNbtTag for BiomePrecipitation {
243-
fn from_nbt_tag(tag: &simdnbt::borrow::NbtTag) -> Option<Self> {
243+
fn from_nbt_tag(tag: simdnbt::borrow::NbtTag) -> Option<Self> {
244244
match tag.string()?.to_str().as_ref() {
245245
"none" => Some(Self::None),
246246
"rain" => Some(Self::Rain),

‎azalea-core/src/resource_location.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl<'de> Deserialize<'de> for ResourceLocation {
101101
}
102102

103103
impl FromNbtTag for ResourceLocation {
104-
fn from_nbt_tag(tag: &simdnbt::borrow::NbtTag) -> Option<Self> {
104+
fn from_nbt_tag(tag: simdnbt::borrow::NbtTag) -> Option<Self> {
105105
tag.string().and_then(|s| s.to_str().parse().ok())
106106
}
107107
}

‎azalea-crypto/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ repository = "https://github.com/azalea-rs/azalea/tree/main/azalea-crypto"
1212
aes = "0.8.4"
1313
azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
1414
cfb8 = "0.8.1"
15-
num-bigint = "^0.4.4"
15+
num-bigint = "^0.4.6"
1616
rand = { version = "^0.8.5", features = ["getrandom"] }
1717
rsa = { version = "0.9.6", features = ["sha2"] }
1818
rsa_public_encrypt_pkcs1 = "0.4.0"
1919
sha-1 = "^0.10.1"
2020
sha2 = "0.10.8"
21-
uuid = "^1.8.0"
21+
uuid = "^1.9.1"
2222

2323
[dev-dependencies]
2424
criterion = { version = "^0.5.1", features = ["html_reports"] }

‎azalea-entity/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "MIT"
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
simdnbt = { version = "0.5", git = "https://github.com/azalea-rs/simdnbt" }
12+
simdnbt = "0.6"
1313
azalea-block = { version = "0.10.0", path = "../azalea-block" }
1414
azalea-buf = { version = "0.10.0", path = "../azalea-buf" }
1515
azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = [
@@ -19,12 +19,12 @@ azalea-core = { version = "0.10.0", path = "../azalea-core" }
1919
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
2020
azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
2121
azalea-world = { version = "0.10.0", path = "../azalea-world" }
22-
bevy_app = "0.13.2"
23-
bevy_ecs = "0.13.2"
24-
derive_more = "0.99.17"
22+
bevy_app = "0.13.0"
23+
bevy_ecs = "0.13.0"
24+
derive_more = "0.99.18"
2525
enum-as-inner = "0.6.0"
2626
tracing = "0.1.40"
2727
nohash-hasher = "0.2.0"
28-
parking_lot = "0.12.1"
29-
thiserror = "1.0.59"
30-
uuid = "1.8.0"
28+
parking_lot = "0.12.3"
29+
thiserror = "1.0.61"
30+
uuid = "1.9.1"

‎azalea-inventory/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ version = "0.10.2"
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
simdnbt = { version = "0.5", git = "https://github.com/azalea-rs/simdnbt" }
12+
simdnbt = "0.6"
1313
azalea-buf = { version = "0.10.0", path = "../azalea-buf" }
1414
azalea-inventory-macros = { version = "0.10.0", path = "./azalea-inventory-macros" }
1515
azalea-registry = { version = "0.10.0", path = "../azalea-registry" }
1616
azalea-chat = { version = "0.10.0", path = "../azalea-chat", features = [
1717
"azalea-buf",
1818
] }
1919
azalea-core = { version = "0.10.0", path = "../azalea-core" }
20-
uuid = "1.8.0"
20+
uuid = "1.9.1"

‎azalea-inventory/azalea-inventory-macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ proc-macro = true
1212
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1313

1414
[dependencies]
15-
proc-macro2 = "1.0.81"
15+
proc-macro2 = "1.0.86"
1616
quote = "1.0.36"
17-
syn = "2.0.60"
17+
syn = "2.0.68"

‎azalea-language/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ version = "0.10.0"
1111
[dependencies]
1212
once_cell = "1.19.0"
1313
serde = "^1.0"
14-
serde_json = "^1.0.116"
14+
serde_json = "^1.0.120"
1515
# tokio = {version = "^1.21.2", features = ["fs"]}

‎azalea-physics/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ azalea-block = { path = "../azalea-block", version = "0.10.0" }
1313
azalea-core = { path = "../azalea-core", version = "0.10.0" }
1414
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
1515
azalea-world = { path = "../azalea-world", version = "0.10.0" }
16-
bevy_app = "0.13.2"
17-
bevy_ecs = "0.13.2"
16+
bevy_app = "0.13.0"
17+
bevy_ecs = "0.13.0"
1818
tracing = "0.1.40"
1919
once_cell = "1.19.0"
20-
parking_lot = "^0.12.1"
20+
parking_lot = "^0.12.3"
2121
nohash-hasher = "0.2.0"
2222
smallvec = "1.13.2"
2323
azalea-entity = { version = "0.10.0", path = "../azalea-entity" }
2424
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
2525

2626
[dev-dependencies]
27-
bevy_time = "0.13.2"
28-
uuid = "^1.8.0"
27+
bevy_time = "0.13.0"
28+
uuid = "^1.9.1"

‎azalea-physics/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#![doc = include_str!("../README.md")]
22
#![feature(trait_alias)]
3-
#![feature(lazy_cell)]
43

54
pub mod clip;
65
pub mod collision;

‎azalea-protocol/Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ version = "0.10.2"
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
simdnbt = { version = "0.5", git = "https://github.com/azalea-rs/simdnbt" }
13-
async-recursion = "1.1.0"
12+
simdnbt = "0.6"
13+
async-recursion = "1.1.1"
1414
azalea-auth = { path = "../azalea-auth", version = "0.10.0" }
1515
azalea-block = { path = "../azalea-block", default-features = false, version = "0.10.0" }
1616
azalea-brigadier = { path = "../azalea-brigadier", version = "0.10.0", features = [
@@ -28,35 +28,35 @@ azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" }
2828
azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "0.10.0" }
2929
azalea-registry = { path = "../azalea-registry", version = "0.10.0" }
3030
azalea-world = { path = "../azalea-world", version = "0.10.0" }
31-
bevy_ecs = { version = "0.13.2", default-features = false }
31+
bevy_ecs = { version = "0.13.0", default-features = false }
3232
byteorder = "^1.5.0"
3333
bytes = "^1.6.0"
34-
flate2 = "1.0.28"
34+
flate2 = "1.0.30"
3535
futures = "0.3.30"
3636
futures-lite = "2.3.0"
3737
futures-util = "0.3.30"
3838
tracing = "0.1.40"
3939
serde = { version = "^1.0", features = ["serde_derive"] }
40-
serde_json = "^1.0.116"
41-
thiserror = "1.0.59"
42-
tokio = { version = "^1.37.0", features = ["io-util", "net", "macros"] }
43-
tokio-util = { version = "0.7.10", features = ["codec"] }
40+
serde_json = "^1.0.120"
41+
thiserror = "1.0.61"
42+
tokio = { version = "^1.38.0", features = ["io-util", "net", "macros"] }
43+
tokio-util = { version = "0.7.11", features = ["codec"] }
4444
trust-dns-resolver = { version = "^0.23.2", default-features = false, features = [
4545
"tokio-runtime",
4646
] }
47-
uuid = "1.8.0"
48-
log = "0.4.21"
47+
uuid = "1.9.1"
48+
log = "0.4.22"
4949
azalea-entity = { version = "0.10.0", path = "../azalea-entity" }
5050
azalea-inventory = { version = "0.10.0", path = "../azalea-inventory" }
51-
socks5-impl = "0.5.12"
51+
socks5-impl = "0.5.14"
5252

5353
[features]
5454
connecting = []
5555
default = ["packets"]
5656
packets = ["connecting", "dep:azalea-core"]
5757

5858
[dev-dependencies]
59-
anyhow = "^1.0.82"
59+
anyhow = "^1.0.86"
6060
tracing = "^0.1.40"
6161
tracing-subscriber = "^0.3.18"
6262
once_cell = "1.19.0"

0 commit comments

Comments
 (0)