Skip to content

Commit

Permalink
Update to latest nightly formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
LJ authored and LJ committed Sep 24, 2024
1 parent 4c1b9cc commit b9a2d4a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@ ws_client = ["ws", "tokio", "ezsockets", "tokio-stream", "dep:http", "tokio-tung
debug = []

[dependencies]
serde = { version = "1.0", features = ["derive"] }
serde = { version = "1.0.210", features = ["derive"] }
serde_with = { version = "3.9.0", features = ["time_0_3"] }
time = { version = "0.3", default-features = false, features = [
time = { version = "0.3.36", default-features = false, features = [
"serde-well-known",
] }
serde_json = { version = "1" }
serde_json = { version = "1.0.128" }
strum = { version = "0.26.3", features = ["derive"] }

# API client specifics
racal = { version = "0.4.0", optional = true }
#racal = { path = "../racal", features = ["reqwest"], optional = true }
governor = { version = "0.6.3", optional = true }
tokio = { version = "1", optional = true, features = ["macros"]}
tokio-stream = { version = "0.1", optional = true}
tokio = { version = "1.40.0", optional = true, features = ["macros"]}
tokio-stream = { version = "0.1.16", optional = true}
http = { version = "1.1.0", optional = true }
async-trait = { version = "0.1", optional = true }
async-trait = { version = "0.1.83", optional = true }
# Required to be defined by us since ezsockets doesn't expose a TLS feature
tokio-tungstenite = {version = "0.23.1", optional= true, default-features = false, features = ["rustls-tls-webpki-roots"] }
tokio-tungstenite = {version = "0.24.0", optional= true, default-features = false, features = ["rustls-tls-webpki-roots"] }

[dependencies.reqwest]
optional = true
Expand All @@ -64,14 +64,14 @@ features = ["json", "rustls-tls"]

[dependencies.ezsockets]
optional = true
version = "0.6.2"
version = "0.6.4"
default-features = false
features = ["client", "native_client", "rustls"]

[dev-dependencies]
tokio-test = "0.4"
tokio = { version = "1", features = ["rt", "macros"]}
once_cell = "1.17"
tokio-test = "0.4.4"
tokio = { version = "1.40.0", features = ["rt", "macros"]}
once_cell = "1.19.0"

[package.metadata.docs.rs]
all-features = true
Expand Down
2 changes: 1 addition & 1 deletion rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "Two"
style_edition = "2024"
max_width = 80
use_small_heuristics = "Max" # Replace with the one below when rustfmt hits 2.0
#width_heuristics = "Max"
Expand Down
8 changes: 4 additions & 4 deletions src/api_client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ use std::num::NonZeroU32;

#[cfg(feature = "http_client")]
use governor::{
Quota,
RateLimiter,
clock::DefaultClock,
middleware::NoOpMiddleware,
state::{InMemoryState, NotKeyed},
Quota,
RateLimiter,
};
use http::{header::InvalidHeaderValue, HeaderName, HeaderValue};
use http::{HeaderName, HeaderValue, header::InvalidHeaderValue};
#[cfg(feature = "http_client")]
pub use racal::reqwest::ApiClient;
#[cfg(feature = "http_client")]
use reqwest::{header::HeaderMap, Client, RequestBuilder};
use reqwest::{Client, RequestBuilder, header::HeaderMap};

#[cfg(feature = "http_client")]
use crate::query::NoAuthentication;
Expand Down
2 changes: 1 addition & 1 deletion src/model/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Models of the API responses to queries.

use serde::{de::Error, Deserialize, Serialize};
use serde::{Deserialize, Serialize, de::Error};
use serde_with::serde_as;

mod invites;
Expand Down

0 comments on commit b9a2d4a

Please sign in to comment.