Skip to content

Commit

Permalink
Update to latest nightly rust 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 cf7cda0 commit 1ff9b87
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ governor = { version = "0.6.3", 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.82", 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 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
6 changes: 3 additions & 3 deletions src/api_client/http.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
use std::num::NonZeroU32;

use governor::{
Quota,
RateLimiter,
clock::DefaultClock,
middleware::NoOpMiddleware,
state::{InMemoryState, NotKeyed},
Quota,
RateLimiter,
};
pub use racal::reqwest::ApiClient;
use reqwest::{
header::{HeaderMap, HeaderValue},
Client,
RequestBuilder,
header::{HeaderMap, HeaderValue},
};
use serde::{Deserialize, Serialize};

Expand Down
2 changes: 1 addition & 1 deletion src/model/message.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize};
use time::{serde::rfc3339, OffsetDateTime};
use time::{OffsetDateTime, serde::rfc3339};

#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
Expand Down
2 changes: 1 addition & 1 deletion src/model/record.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::HashSet;

use serde::{Deserialize, Serialize};
use time::{serde::rfc3339, OffsetDateTime};
use time::{OffsetDateTime, serde::rfc3339};

#[serde_with::serde_as]
#[derive(Debug, PartialEq, Clone, Deserialize, Serialize)]
Expand Down
2 changes: 1 addition & 1 deletion src/model/sessions_info.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use time::{serde::rfc3339, OffsetDateTime};
use time::{OffsetDateTime, serde::rfc3339};

use super::AssemblyInfo;

Expand Down
2 changes: 1 addition & 1 deletion src/model/stats.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::collections::HashMap;

use serde::{Deserialize, Serialize};
use time::serde::rfc3339;
use time::OffsetDateTime;
use time::serde::rfc3339;

use super::{SessionAccessLevel, UserSessionType};

Expand Down
2 changes: 1 addition & 1 deletion src/model/submission.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize};
use time::{serde::rfc3339, OffsetDateTime};
use time::{OffsetDateTime, serde::rfc3339};

#[derive(Debug, PartialEq, Eq, Hash, Clone, Deserialize, Serialize)]
#[serde(rename_all = "camelCase")]
Expand Down
2 changes: 1 addition & 1 deletion src/model/user.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::{Deserialize, Serialize};
use time::{serde::rfc3339, OffsetDateTime};
use time::{OffsetDateTime, serde::rfc3339};

#[serde_with::serde_as]
#[derive(Debug, Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
Expand Down
2 changes: 1 addition & 1 deletion src/model/user_session.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use serde::{Deserialize, Serialize};
use serde_with::serde_as;
use time::{serde::rfc3339, OffsetDateTime};
use time::{OffsetDateTime, serde::rfc3339};

#[serde_as]
#[derive(Clone, PartialEq, Eq, Hash, Deserialize, Serialize)]
Expand Down
2 changes: 1 addition & 1 deletion src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pub mod opt_rfc3339 {
//! Time serde for date time's RFC3339 where errors are converted to None.
#![allow(clippy::unnecessary_wraps)]
use serde::{Deserializer, Serializer};
use time::{serde::rfc3339, OffsetDateTime};
use time::{OffsetDateTime, serde::rfc3339};

/// Deserializes data into an offset date time, ignoring errors
///
Expand Down

0 comments on commit 1ff9b87

Please sign in to comment.