Skip to content

Commit

Permalink
upgrade thiserror and other deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@mat-1
mat-1 committed Aug 16, 2023
1 parent 776f714 commit 4ed4be5
Show file tree
Hide file tree
Showing 23 changed files with 197 additions and 189 deletions.
224 changes: 118 additions & 106 deletions Cargo.lock
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions azalea-auth/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ azalea-buf = { path = "../azalea-buf", version = "^0.7.0" }
azalea-crypto = { path = "../azalea-crypto", version = "^0.7.0" }
base64 = "0.21.2"
chrono = { version = "0.4.26", default-features = false, features = ["serde"] }
log = "0.4.19"
log = "0.4.20"
num-bigint = "0.4.3"
once_cell = "1.18.0"
reqwest = { version = "0.11.18", default-features = false, features = [
"json",
"rustls-tls",
] }
rsa = "0.9.2"
serde = { version = "1.0.170", features = ["derive"] }
serde_json = "1.0.100"
thiserror = "1.0.43"
tokio = { version = "1.29.1", features = ["fs"] }
uuid = { version = "1.4.0", features = ["serde"] }
serde = { version = "1.0.183", features = ["derive"] }
serde_json = "1.0.105"
thiserror = "1.0.46"
tokio = { version = "1.31.0", features = ["fs"] }
uuid = { version = "1.4.1", features = ["serde"] }

[dev-dependencies]
env_logger = "0.10.0"
tokio = { version = "1.29.1", features = ["full"] }
tokio = { version = "1.31.0", features = ["full"] }
6 changes: 3 additions & 3 deletions azalea-block/azalea-block-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,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.64"
quote = "1.0.29"
syn = "2.0.25"
proc-macro2 = "1.0.66"
quote = "1.0.32"
syn = "2.0.28"
6 changes: 3 additions & 3 deletions azalea-buf/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ version = "0.7.0"
[dependencies]
azalea-buf-macros = { path = "./azalea-buf-macros", version = "^0.7.0" }
byteorder = "^1.4.3"
log = "0.4.19"
log = "0.4.20"
serde_json = { version = "^1.0", optional = true }
thiserror = "1.0.43"
uuid = "^1.4.0"
thiserror = "1.0.46"
uuid = "^1.4.1"

[features]
serde_json = ["dep:serde_json"]
6 changes: 3 additions & 3 deletions azalea-buf/azalea-buf-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.64"
quote = "^1.0.29"
syn = { version = "^2.0.25", features = ["extra-traits"] }
proc-macro2 = "^1.0.66"
quote = "^1.0.32"
syn = { version = "^2.0.28", features = ["extra-traits"] }
1 change: 0 additions & 1 deletion azalea-buf/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#![feature(min_specialization)]
// these two are necessary for thiserror backtraces
#![feature(error_generic_member_access)]
#![feature(provide_any)]

mod definitions;
mod read;
Expand Down
4 changes: 2 additions & 2 deletions azalea-chat/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ azalea-buf = { path = "../azalea-buf", features = [
"serde_json",
], version = "^0.7.0", optional = true }
azalea-language = { path = "../azalea-language", version = "^0.7.0" }
log = "0.4.19"
log = "0.4.20"
once_cell = "1.18.0"
serde = { version = "^1.0", features = ["derive"] }
serde_json = "^1.0.100"
serde_json = "^1.0.105"
24 changes: 12 additions & 12 deletions azalea-client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ version = "0.7.0"

[dependencies]
reqwest = { version = "0.11.18", default-features = false }
anyhow = "1.0.71"
async-trait = "0.1.71"
anyhow = "1.0.74"
async-trait = "0.1.73"
azalea-auth = { path = "../azalea-auth", version = "0.7.0" }
azalea-block = { path = "../azalea-block", version = "0.7.0" }
azalea-nbt = { path = "../azalea-nbt", version = "0.7.0" }
Expand All @@ -23,22 +23,22 @@ azalea-buf = { path = "../azalea-buf", version = "0.7.0" }
azalea-protocol = { path = "../azalea-protocol", version = "0.7.0" }
azalea-registry = { path = "../azalea-registry", version = "0.7.0" }
azalea-world = { path = "../azalea-world", version = "0.7.0" }
bevy_app = "0.11.0"
bevy_ecs = "0.11.0"
bevy_log = "0.11.0"
bevy_tasks = "0.11.0"
bevy_time = "0.11.0"
bevy_app = "0.11.1"
bevy_ecs = "0.11.1"
bevy_log = "0.11.1"
bevy_tasks = "0.11.1"
bevy_time = "0.11.1"
azalea-inventory = { path = "../azalea-inventory", version = "0.7.0" }
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
futures = "0.3.28"
log = "0.4.19"
log = "0.4.20"
nohash-hasher = "0.2.0"
once_cell = "1.18.0"
parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
regex = "1.9.1"
thiserror = "^1.0.43"
tokio = { version = "^1.29.1", features = ["sync"] }
uuid = "^1.4.0"
regex = "1.9.3"
thiserror = "^1.0.46"
tokio = { version = "^1.31.0", features = ["sync"] }
uuid = "^1.4.1"
azalea-entity = { version = "0.1.0", path = "../azalea-entity" }

[features]
Expand Down
1 change: 0 additions & 1 deletion azalea-client/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//! [`azalea_protocol`]: https://docs.rs/azalea-protocol
//! [`azalea`]: https://docs.rs/azalea

#![feature(provide_any)]
#![allow(incomplete_features)]
#![feature(trait_upcasting)]
#![feature(error_generic_member_access)]
Expand Down
6 changes: 3 additions & 3 deletions azalea-core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ azalea-buf = { path = "../azalea-buf", version = "^0.7.0" }
azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" }
azalea-nbt = { path = "../azalea-nbt", version = "^0.7.0" }
azalea-registry = { path = "../azalea-registry", version = "^0.7.0" }
bevy_ecs = { version = "0.11.0", default-features = false, optional = true }
num-traits = "0.2.15"
bevy_ecs = { version = "0.11.1", default-features = false, optional = true }
num-traits = "0.2.16"
serde = { version = "^1.0", optional = true }
uuid = "^1.4.0"
uuid = "^1.4.1"

[features]
bevy_ecs = ["dep:bevy_ecs"]
Expand Down
2 changes: 1 addition & 1 deletion azalea-crypto/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rsa = { version = "0.9.2", features = ["sha2"] }
rsa_public_encrypt_pkcs1 = "0.4.0"
sha-1 = "^0.10.1"
sha2 = "0.10.7"
uuid = "^1.4.0"
uuid = "^1.4.1"

[dev-dependencies]
criterion = { version = "^0.5.1", features = ["html_reports"] }
Expand Down
10 changes: 5 additions & 5 deletions azalea-entity/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" }
azalea-nbt = { version = "0.7.0", path = "../azalea-nbt" }
azalea-registry = { version = "0.7.0", path = "../azalea-registry" }
azalea-world = { version = "0.7.0", path = "../azalea-world" }
bevy_app = "0.11.0"
bevy_ecs = "0.11.0"
bevy_app = "0.11.1"
bevy_ecs = "0.11.1"
derive_more = "0.99.17"
enum-as-inner = "0.6.0"
log = "0.4.19"
log = "0.4.20"
nohash-hasher = "0.2.0"
parking_lot = "0.12.1"
thiserror = "1.0.43"
uuid = "1.4.0"
thiserror = "1.0.46"
uuid = "1.4.1"
6 changes: 3 additions & 3 deletions azalea-inventory/azalea-inventory-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,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.64"
quote = "1.0.29"
syn = "2.0.25"
proc-macro2 = "1.0.66"
quote = "1.0.32"
syn = "2.0.28"
2 changes: 1 addition & 1 deletion azalea-language/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ version = "0.7.0"
[dependencies]
once_cell = "1.18.0"
serde = "^1.0"
serde_json = "^1.0.100"
serde_json = "^1.0.105"
# tokio = {version = "^1.21.2", features = ["fs"]}
4 changes: 2 additions & 2 deletions azalea-nbt/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ azalea-buf = { path = "../azalea-buf", version = "^0.7.0" }
byteorder = "^1.4.3"
compact_str = { version = "0.7.1", features = ["serde"] }
enum-as-inner = "0.6.0"
flate2 = "^1.0.26"
log = "0.4.19"
flate2 = "^1.0.27"
log = "0.4.20"
serde = { version = "^1.0", features = ["derive"], optional = true }

[dev-dependencies]
Expand Down
8 changes: 4 additions & 4 deletions azalea-physics/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ azalea-entity = { version = "0.1.0", path = "../azalea-entity" }
azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" }
azalea-registry = { path = "../azalea-registry", version = "^0.7.0" }
azalea-world = { path = "../azalea-world", version = "^0.7.0" }
bevy_app = "0.11.0"
bevy_ecs = "0.11.0"
bevy_app = "0.11.1"
bevy_ecs = "0.11.1"
once_cell = "1.18.0"
parking_lot = "^0.12.1"

[dev-dependencies]
bevy_time = "0.11.0"
uuid = "^1.4.0"
bevy_time = "0.11.1"
uuid = "^1.4.1"
18 changes: 9 additions & 9 deletions azalea-protocol/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = "0.7.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
async-compression = { version = "^0.4.0", features = [
async-compression = { version = "^0.4.1", features = [
"tokio",
"zlib",
], optional = true }
Expand All @@ -33,23 +33,23 @@ azalea-nbt = { path = "../azalea-nbt", version = "^0.7.0", features = [
azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "^0.7.0" }
azalea-registry = { path = "../azalea-registry", version = "^0.7.0" }
azalea-world = { path = "../azalea-world", version = "^0.7.0" }
bevy_ecs = { version = "0.11.0", default-features = false }
bevy_ecs = { version = "0.11.1", default-features = false }
byteorder = "^1.4.3"
bytes = "^1.4.0"
flate2 = "1.0.26"
flate2 = "1.0.27"
futures = "0.3.28"
futures-lite = "1.13.0"
futures-util = "0.3.28"
log = "0.4.19"
log = "0.4.20"
serde = { version = "^1.0", features = ["serde_derive"] }
serde_json = "^1.0.100"
thiserror = "1.0.43"
tokio = { version = "^1.29.1", features = ["io-util", "net", "macros"] }
serde_json = "^1.0.105"
thiserror = "1.0.46"
tokio = { version = "^1.31.0", features = ["io-util", "net", "macros"] }
tokio-util = { version = "0.7.8", features = ["codec"] }
trust-dns-resolver = { version = "^0.22.0", default-features = false, features = [
"tokio-runtime",
] }
uuid = "1.4.0"
uuid = "1.4.1"

[features]
connecting = []
Expand All @@ -58,7 +58,7 @@ packets = ["connecting", "dep:async-compression", "dep:azalea-core"]
strict_registry = ["packets"]

[dev-dependencies]
anyhow = "^1.0.71"
anyhow = "^1.0.74"
tracing = "^0.1.37"
tracing-subscriber = "^0.3.17"
once_cell = "1.18.0"
6 changes: 3 additions & 3 deletions azalea-protocol/azalea-protocol-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.64"
quote = "^1.0.29"
syn = "^2.0.25"
proc-macro2 = "^1.0.66"
quote = "^1.0.32"
syn = "^2.0.28"
1 change: 0 additions & 1 deletion azalea-protocol/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

// these two are necessary for thiserror backtraces
#![feature(error_generic_member_access)]
#![feature(provide_any)]

use std::{fmt::Display, net::SocketAddr, str::FromStr};

Expand Down
6 changes: 3 additions & 3 deletions azalea-registry/azalea-registry-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ proc-macro = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
proc-macro2 = "1.0.64"
quote = "1.0.29"
syn = "2.0.25"
proc-macro2 = "1.0.66"
quote = "1.0.32"
syn = "2.0.28"

[features]
serde = []
8 changes: 4 additions & 4 deletions azalea-world/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ azalea-core = { path = "../azalea-core", version = "^0.7.0", features = [
azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" }
azalea-nbt = { path = "../azalea-nbt", version = "^0.7.0" }
azalea-registry = { path = "../azalea-registry", version = "^0.7.0" }
bevy_ecs = "0.11.0"
bevy_ecs = "0.11.1"
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
enum-as-inner = "0.6.0"
log = "0.4.19"
log = "0.4.20"
nohash-hasher = "0.2.0"
once_cell = "1.18.0"
parking_lot = "^0.12.1"
thiserror = "1.0.43"
uuid = "1.4.0"
thiserror = "1.0.46"
uuid = "1.4.1"

[profile.release]
lto = true
Expand Down
1 change: 0 additions & 1 deletion azalea-world/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#![doc = include_str!("../README.md")]
#![feature(int_roundings)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]

mod bit_storage;
mod chunk_storage;
Expand Down
22 changes: 11 additions & 11 deletions azalea/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ pre-release-replacements = [
]

[dependencies]
anyhow = "^1.0.71"
async-trait = "0.1.71"
anyhow = "^1.0.74"
async-trait = "0.1.73"
azalea-block = { version = "0.7.0", path = "../azalea-block" }
azalea-chat = { version = "0.7.0", path = "../azalea-chat" }
azalea-client = { version = "0.7.0", path = "../azalea-client" }
Expand All @@ -25,21 +25,21 @@ azalea-registry = { version = "0.7.0", path = "../azalea-registry" }
azalea-world = { version = "0.7.0", path = "../azalea-world" }
azalea-auth = { version = "0.7.0", path = "../azalea-auth" }
azalea-brigadier = { version = "0.7.0", path = "../azalea-brigadier" }
bevy_app = "0.11.0"
bevy_ecs = "0.11.0"
bevy_tasks = "0.11.0"
bevy_app = "0.11.1"
bevy_ecs = "0.11.1"
bevy_tasks = "0.11.1"
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
futures = "0.3.28"
futures-lite = "1.13.0"
log = "0.4.19"
log = "0.4.20"
nohash-hasher = "0.2.0"
num-traits = "0.2.15"
num-traits = "0.2.16"
parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
priority-queue = "1.3.2"
thiserror = "^1.0.43"
tokio = "^1.29.1"
uuid = "1.4.0"
bevy_log = "0.11.0"
thiserror = "^1.0.46"
tokio = "^1.31.0"
uuid = "1.4.1"
bevy_log = "0.11.1"
azalea-entity = { version = "0.1.0", path = "../azalea-entity" }

[features]
Expand Down

0 comments on commit 4ed4be5

Please sign in to comment.