aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-11-11 23:10:38 -0600
committermat <github@matdoes.dev>2022-11-11 23:10:38 -0600
commit16d0cb734caee11cf5424b7b0f5d5d8e68483fe1 (patch)
tree07b50d34f11d88add627a37c96b40a2835c1aa46
parentd2353492294ba896772df398af16427beb84b4e1 (diff)
downloadazalea-drasl-16d0cb734caee11cf5424b7b0f5d5d8e68483fe1.tar.xz
change some dependencies
-rwxr-xr-xCargo.lock165
-rw-r--r--azalea-auth/Cargo.toml4
-rw-r--r--azalea-buf/Cargo.toml2
-rw-r--r--azalea-client/Cargo.toml2
-rw-r--r--azalea-crypto/src/lib.rs1
-rw-r--r--azalea-language/Cargo.toml4
-rw-r--r--azalea-protocol/Cargo.toml28
-rw-r--r--azalea/Cargo.toml4
-rw-r--r--bot/Cargo.toml8
9 files changed, 60 insertions, 158 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 73103862..de3c0411 100755
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -107,7 +107,7 @@ dependencies = [
"azalea-client",
"azalea-protocol",
"env_logger",
- "parking_lot 0.12.1",
+ "parking_lot",
"thiserror",
"tokio",
]
@@ -121,7 +121,6 @@ dependencies = [
"chrono",
"env_logger",
"log",
- "num-bigint",
"reqwest",
"serde",
"serde_json",
@@ -197,7 +196,7 @@ dependencies = [
"azalea-protocol",
"azalea-world",
"log",
- "parking_lot 0.12.1",
+ "parking_lot",
"thiserror",
"tokio",
"uuid",
@@ -330,7 +329,7 @@ dependencies = [
"azalea-core",
"azalea-nbt",
"azalea-registry",
- "enum-as-inner 0.5.1",
+ "enum-as-inner",
"log",
"nohash-hasher",
"thiserror",
@@ -365,7 +364,7 @@ dependencies = [
"anyhow",
"azalea",
"env_logger",
- "parking_lot 0.12.1",
+ "parking_lot",
"tokio",
"uuid",
]
@@ -641,18 +640,6 @@ dependencies = [
[[package]]
name = "enum-as-inner"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "570d109b813e904becc80d8d5da38376818a143348413f7149f1340fe04754d4"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "enum-as-inner"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
@@ -883,17 +870,6 @@ dependencies = [
]
[[package]]
-name = "hostname"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
-dependencies = [
- "libc",
- "match_cfg",
- "winapi",
-]
-
-[[package]]
name = "http"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -950,7 +926,7 @@ dependencies = [
"httpdate",
"itoa 1.0.2",
"pin-project-lite",
- "socket2 0.4.4",
+ "socket2",
"tokio",
"tower-service",
"tracing",
@@ -1010,18 +986,6 @@ dependencies = [
]
[[package]]
-name = "ipconfig"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7"
-dependencies = [
- "socket2 0.3.19",
- "widestring",
- "winapi",
- "winreg 0.6.2",
-]
-
-[[package]]
name = "ipnet"
version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1104,12 +1068,6 @@ dependencies = [
]
[[package]]
-name = "match_cfg"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
-
-[[package]]
name = "matches"
version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1337,37 +1295,12 @@ dependencies = [
[[package]]
name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.5",
-]
-
-[[package]]
-name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.3",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
+ "parking_lot_core",
]
[[package]]
@@ -1443,20 +1376,14 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
[[package]]
name = "proc-macro2"
-version = "1.0.39"
+version = "1.0.47"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
dependencies = [
"unicode-ident",
]
[[package]]
-name = "quick-error"
-version = "1.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
-
-[[package]]
name = "quote"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1594,17 +1521,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "winreg 0.10.1",
-]
-
-[[package]]
-name = "resolv-conf"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
-dependencies = [
- "hostname",
- "quick-error",
+ "winreg",
]
[[package]]
@@ -1786,17 +1703,6 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
[[package]]
name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
@@ -1807,9 +1713,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "1.0.96"
+version = "1.0.103"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
+checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
dependencies = [
"proc-macro2",
"quote",
@@ -1905,10 +1811,10 @@ dependencies = [
"memchr",
"mio",
"num_cpus",
- "parking_lot 0.12.1",
+ "parking_lot",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.4.4",
+ "socket2",
"tokio-macros",
"winapi",
]
@@ -1962,10 +1868,22 @@ checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
dependencies = [
"cfg-if",
"pin-project-lite",
+ "tracing-attributes",
"tracing-core",
]
[[package]]
+name = "tracing-attributes"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
name = "tracing-core"
version = "0.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1976,46 +1894,44 @@ dependencies = [
[[package]]
name = "trust-dns-proto"
-version = "0.20.4"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca94d4e9feb6a181c690c4040d7a24ef34018d8313ac5044a61d21222ae24e31"
+checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
dependencies = [
"async-trait",
"cfg-if",
"data-encoding",
- "enum-as-inner 0.3.4",
+ "enum-as-inner",
"futures-channel",
"futures-io",
"futures-util",
"idna",
"ipnet",
"lazy_static",
- "log",
"rand",
"smallvec",
"thiserror",
"tinyvec",
"tokio",
+ "tracing",
"url",
]
[[package]]
name = "trust-dns-resolver"
-version = "0.20.4"
+version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecae383baad9995efaa34ce8e57d12c3f305e545887472a492b838f4b5cfb77a"
+checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe"
dependencies = [
"cfg-if",
"futures-util",
- "ipconfig",
"lazy_static",
- "log",
"lru-cache",
- "parking_lot 0.11.2",
- "resolv-conf",
+ "parking_lot",
"smallvec",
"thiserror",
"tokio",
+ "tracing",
"trust-dns-proto",
]
@@ -2198,12 +2114,6 @@ dependencies = [
]
[[package]]
-name = "widestring"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c"
-
-[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2279,15 +2189,6 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
[[package]]
name = "winreg"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winreg"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml
index da5460ab..e7398cc5 100644
--- a/azalea-auth/Cargo.toml
+++ b/azalea-auth/Cargo.toml
@@ -9,8 +9,8 @@ version = "0.3.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-azalea-buf = {path = "../azalea-buf", version = "^0.3.0" }
-azalea-crypto = {path = "../azalea-crypto", version = "^0.3.0" }
+azalea-buf = {path = "../azalea-buf", version = "^0.3.0"}
+azalea-crypto = {path = "../azalea-crypto", version = "^0.3.0"}
chrono = {version = "0.4.22", default-features = false}
log = "0.4.17"
num-bigint = "0.4.3"
diff --git a/azalea-buf/Cargo.toml b/azalea-buf/Cargo.toml
index d8be1a11..3058d442 100644
--- a/azalea-buf/Cargo.toml
+++ b/azalea-buf/Cargo.toml
@@ -13,7 +13,7 @@ azalea-buf-macros = {path = "./azalea-buf-macros", version = "^0.3.0" }
byteorder = "^1.4.3"
serde_json = {version = "^1.0", optional = true}
thiserror = "^1.0.34"
-tokio = {version = "^1.19.2", features = ["io-util", "net", "macros"]}
+tokio = {version = "^1.21.2", features = ["io-util", "net", "macros"]}
uuid = "^1.1.2"
[features]
diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml
index 93559293..a430044e 100644
--- a/azalea-client/Cargo.toml
+++ b/azalea-client/Cargo.toml
@@ -21,5 +21,5 @@ azalea-world = { path = "../azalea-world", version = "0.3.0" }
log = "0.4.17"
parking_lot = "0.12.1"
thiserror = "^1.0.34"
-tokio = { version = "^1.19.2", features = ["sync"] }
+tokio = { version = "^1.21.2", features = ["sync"] }
uuid = "^1.1.2"
diff --git a/azalea-crypto/src/lib.rs b/azalea-crypto/src/lib.rs
index 30362e5d..484031ec 100644
--- a/azalea-crypto/src/lib.rs
+++ b/azalea-crypto/src/lib.rs
@@ -29,6 +29,7 @@ pub fn hex_digest(digest: &[u8]) -> String {
// and libraries. It works by treating the sha1 output bytes as one large
// integer in two's complement and then printing the integer in base 16,
// placing a minus sign if the interpreted number is negative.
+
num_bigint::BigInt::from_signed_bytes_be(digest).to_str_radix(16)
}
diff --git a/azalea-language/Cargo.toml b/azalea-language/Cargo.toml
index 4793092a..942fbad0 100644
--- a/azalea-language/Cargo.toml
+++ b/azalea-language/Cargo.toml
@@ -3,8 +3,8 @@ description = "Translate Minecraft strings from their id."
edition = "2021"
license = "MIT"
name = "azalea-language"
-version = "0.3.0"
repository = "https://github.com/mat-1/azalea/tree/main/azalea-language"
+version = "0.3.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -12,4 +12,4 @@ repository = "https://github.com/mat-1/azalea/tree/main/azalea-language"
lazy_static = "1.4.0"
serde = "1.0.137"
serde_json = "1.0.81"
-# tokio = {version = "1.19.2", features = ["fs"]}
+# tokio = {version = "^1.21.2", features = ["fs"]}
diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml
index f08282d0..35bd88d7 100644
--- a/azalea-protocol/Cargo.toml
+++ b/azalea-protocol/Cargo.toml
@@ -3,25 +3,25 @@ description = "Send and receive Minecraft packets."
edition = "2021"
license = "MIT"
name = "azalea-protocol"
-version = "0.3.0"
repository = "https://github.com/mat-1/azalea/tree/main/azalea-protocol"
+version = "0.3.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
async-compression = {version = "^0.3.8", features = ["tokio", "zlib"], optional = true}
async-recursion = "1.0.0"
-azalea-auth = {path = "../azalea-auth", version = "^0.3.0" }
-azalea-block = {path = "../azalea-block", default-features = false, version = "^0.3.0" }
-azalea-brigadier = {path = "../azalea-brigadier", version = "^0.3.0" }
-azalea-buf = {path = "../azalea-buf", version = "^0.3.0" }
-azalea-chat = {path = "../azalea-chat", version = "^0.3.0" }
-azalea-core = {path = "../azalea-core", optional = true, version = "^0.3.0" }
-azalea-crypto = {path = "../azalea-crypto", version = "^0.3.0" }
-azalea-nbt = {path = "../azalea-nbt", version = "^0.3.0" }
-azalea-protocol-macros = {path = "./azalea-protocol-macros", version = "^0.3.0" }
-azalea-registry = {path = "../azalea-registry", version = "^0.3.0" }
-azalea-world = {path = "../azalea-world", version = "^0.3.0" }
+azalea-auth = {path = "../azalea-auth", version = "^0.3.0"}
+azalea-block = {path = "../azalea-block", default-features = false, version = "^0.3.0"}
+azalea-brigadier = {path = "../azalea-brigadier", version = "^0.3.0"}
+azalea-buf = {path = "../azalea-buf", version = "^0.3.0"}
+azalea-chat = {path = "../azalea-chat", version = "^0.3.0"}
+azalea-core = {path = "../azalea-core", optional = true, version = "^0.3.0"}
+azalea-crypto = {path = "../azalea-crypto", version = "^0.3.0"}
+azalea-nbt = {path = "../azalea-nbt", version = "^0.3.0"}
+azalea-protocol-macros = {path = "./azalea-protocol-macros", version = "^0.3.0"}
+azalea-registry = {path = "../azalea-registry", version = "^0.3.0"}
+azalea-world = {path = "../azalea-world", version = "^0.3.0"}
byteorder = "^1.4.3"
bytes = "^1.1.0"
flate2 = "1.0.23"
@@ -31,9 +31,9 @@ log = "0.4.17"
serde = {version = "1.0.130", features = ["serde_derive"]}
serde_json = "^1.0.72"
thiserror = "^1.0.34"
-tokio = {version = "^1.19.2", features = ["io-util", "net", "macros"]}
+tokio = {version = "^1.21.2", features = ["io-util", "net", "macros"]}
tokio-util = {version = "0.7.4", features = ["codec"]}
-trust-dns-resolver = "^0.20.3"
+trust-dns-resolver = {version = "^0.22.0", default-features = false, features = ["tokio-runtime"]}
uuid = "1.1.2"
[features]
diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml
index 35387bf1..2719b43c 100644
--- a/azalea/Cargo.toml
+++ b/azalea/Cargo.toml
@@ -15,9 +15,9 @@ azalea-client = {version = "0.3.0", path = "../azalea-client"}
azalea-protocol = {version = "0.3.0", path = "../azalea-protocol"}
parking_lot = "^0.12.1"
thiserror = "^1.0.37"
-tokio = "^1.21.1"
+tokio = "^1.21.2"
[dev-dependencies]
anyhow = "^1.0.65"
env_logger = "^0.9.1"
-tokio = "^1.21.1"
+tokio = "^1.21.2"
diff --git a/bot/Cargo.toml b/bot/Cargo.toml
index 3966887e..9212f796 100644
--- a/bot/Cargo.toml
+++ b/bot/Cargo.toml
@@ -1,16 +1,16 @@
[package]
edition = "2021"
name = "bot"
-version = "0.2.0"
publish = false
release = false
+version = "0.2.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
anyhow = "1.0.65"
-azalea = { path = "../azalea" }
+azalea = {path = "../azalea"}
env_logger = "0.9.1"
-tokio = "1.19.2"
-uuid = "1.1.2"
parking_lot = "^0.12.1"
+tokio = "^1.21.2"
+uuid = "1.1.2"