From dfdc3144b61b6750ad62fb493b7c00c6c820c90b Mon Sep 17 00:00:00 2001
From: Shayne Hartford <shaybox@shaybox.com>
Date: Sat, 23 Nov 2024 03:29:30 -0500
Subject: 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
---
 azalea-auth/Cargo.toml  | 33 +++++++++++++++------------------
 azalea-auth/src/auth.rs |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'azalea-auth')

diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml
index dce850bf..7eb38c19 100644
--- a/azalea-auth/Cargo.toml
+++ b/azalea-auth/Cargo.toml
@@ -11,23 +11,20 @@ version = "0.10.3+mc1.21.1"
 [dependencies]
 azalea-buf = { path = "../azalea-buf", version = "0.10.0" }
 azalea-crypto = { path = "../azalea-crypto", version = "0.10.0" }
-base64 = "0.22.1"
-chrono = { version = "0.4.38", default-features = false, features = ["serde"] }
-tracing = "0.1.40"
-num-bigint = "0.4.6"
-once_cell = "1.19.0"
-reqwest = { version = "0.12.5", default-features = false, features = [
-    "json",
-    "rustls-tls",
-] }
-rsa = "0.9.6"
-serde = { version = "1.0.203", features = ["derive"] }
-serde_json = "1.0.120"
-thiserror = "1.0.61"
-tokio = { version = "1.38.0", features = ["fs"] }
-uuid = { version = "1.9.1", features = ["serde", "v3"] }
-md-5 = "0.10.6"
+base64 = { workspace = true }
+chrono = { workspace = true, features = ["serde"] }
+md-5 = { workspace = true }
+#num-bigint = { workspace = true }
+once_cell = { workspace = true }
+reqwest = { workspace = true, features = ["json", "rustls-tls"] }
+rsa = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["fs"] }
+tracing = { workspace = true }
+uuid = { workspace = true, features = ["serde", "v3"] }
 
 [dev-dependencies]
-env_logger = "0.11.3"
-tokio = { version = "1.38.0", features = ["full"] }
+env_logger = { workspace = true }
+tokio = { workspace = true, features = ["full"] }
diff --git a/azalea-auth/src/auth.rs b/azalea-auth/src/auth.rs
index e70be27d..55d7d36a 100755
--- a/azalea-auth/src/auth.rs
+++ b/azalea-auth/src/auth.rs
@@ -68,7 +68,7 @@ pub enum AuthError {
 /// If you want to use your own code to cache or show the auth code to the user
 /// in a different way, use [`get_ms_link_code`], [`get_ms_auth_token`],
 /// [`get_minecraft_token`] and [`get_profile`] instead.
-pub async fn auth<'a>(email: &str, opts: AuthOpts<'a>) -> Result<AuthResult, AuthError> {
+pub async fn auth(email: &str, opts: AuthOpts<'_>) -> Result<AuthResult, AuthError> {
     let cached_account = if let Some(cache_file) = &opts.cache_file {
         cache::get_account_in_cache(cache_file, email).await
     } else {
-- 
cgit v1.2.3