More clippy and rustfmt things (#1278)

More linting and uniform code style reduces the things to watch out for
in review. I'm running a nightly toolchain locally now, and have noticed
some extra lints from that. Also enabled one extra clippy lint via
`Cargo.toml`.

Author: svix-jplatte

bridge/svix-bridge/src/config/mod.rs

@@ -2,6 +2,7 @@ use std::{
     borrow::Cow,
     collections::HashMap,
     convert::Infallible,
+    fmt,
     io::{Error, ErrorKind},
     net::SocketAddr,
     num::NonZeroUsize,
@@ -121,14 +122,14 @@ pub enum LogLevel {
     Trace,
 }
 
-impl ToString for LogLevel {
-    fn to_string(&self) -> String {
+impl fmt::Display for LogLevel {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Info => Level::INFO,
             Self::Debug => Level::DEBUG,
             Self::Trace => Level::TRACE,
         }
-        .to_string()
+        .fmt(f)
     }
 }
 

server/.clippy.toml

@@ -0,0 +1 @@
+allow-mixed-uninlined-format-args = false

server/Cargo.toml

@@ -15,6 +15,7 @@ macro_use_imports = "warn"
 mut_mut = "warn"
 nonstandard_macro_braces = "warn"
 todo = "warn"
+uninlined_format_args = "warn"
 
 [profile.dev.package]
 quote = { opt-level = 2 }

server/svix-server/src/cfg.rs

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
 
-use std::{borrow::Cow, collections::HashMap, net::SocketAddr, sync::Arc, time::Duration};
+use std::{borrow::Cow, collections::HashMap, fmt, net::SocketAddr, sync::Arc, time::Duration};
 
 use figment::{
     providers::{Env, Format, Toml},
@@ -12,7 +12,10 @@ use serde::{Deserialize, Deserializer};
 use tracing::Level;
 use validator::{Validate, ValidationError};
 
-use crate::{core::cryptography::Encryption, core::security::JwtSigningConfig, error::Result};
+use crate::{
+    core::{cryptography::Encryption, security::JwtSigningConfig},
+    error::Result,
+};
 
 fn deserialize_main_secret<'de, D>(deserializer: D) -> Result<Encryption, D::Error>
 where
@@ -365,16 +368,17 @@ impl std::fmt::Display for Environment {
     }
 }
 
-impl ToString for LogLevel {
-    fn to_string(&self) -> String {
+impl fmt::Display for LogLevel {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Info => Level::INFO,
             Self::Debug => Level::DEBUG,
             Self::Trace => Level::TRACE,
         }
-        .to_string()
+        .fmt(f)
     }
 }
+
 pub fn load() -> Result<Arc<ConfigurationInner>> {
     if let Ok(db_url) = std::env::var("DATABASE_URL") {
         // If we have DATABASE_URL set, we should potentially use it.

server/svix-server/src/core/message_app.rs

@@ -209,7 +209,7 @@ impl AppEndpointKey {
     // FIXME: Rewrite doc comment when AppEndpointValue members are known
     /// Returns a key for fetching all cached endpoints for a given organization and application.
     pub fn new(org: &OrganizationId, app: &ApplicationId) -> AppEndpointKey {
-        AppEndpointKey(format!("SVIX_CACHE_APP_v3_{}_{}", org, app))
+        AppEndpointKey(format!("SVIX_CACHE_APP_v3_{org}_{app}"))
     }
 }
 

server/svix-server/src/core/webhook_http_client.rs

@@ -381,7 +381,7 @@ impl RequestBuilder {
         let uri = self.uri.unwrap();
         let authority = uri.authority().expect("Missing authority");
         let host = match authority.port() {
-            Some(port) => format!("{}:{}", authority.host(), port),
+            Some(port) => format!("{}:{port}", authority.host()),
             None => authority.host().to_string(),
         };
 

server/svix-server/src/db/models/application.rs

@@ -1,16 +1,14 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
 
-use crate::core::types::{
-    ApplicationId, ApplicationIdOrUid, ApplicationUid, BaseId, OrganizationId,
-};
-use crate::error;
 use chrono::Utc;
-use sea_orm::ActiveValue::Set;
-use sea_orm::ConnectionTrait;
-use sea_orm::{entity::prelude::*, Condition};
+use sea_orm::{entity::prelude::*, ActiveValue::Set, Condition};
 
 use super::applicationmetadata;
+use crate::{
+    core::types::{ApplicationId, ApplicationIdOrUid, ApplicationUid, BaseId, OrganizationId},
+    error,
+};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "application")]

server/svix-server/src/db/models/applicationmetadata.rs

@@ -1,14 +1,13 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
-use crate::core::types::ApplicationId;
 
-use crate::core::types::metadata::Metadata;
-use crate::error;
 use chrono::Utc;
-use sea_orm::entity::prelude::*;
-use sea_orm::sea_query::OnConflict;
-use sea_orm::ActiveValue::Set;
-use sea_orm::{ConnectionTrait, TryIntoModel};
+use sea_orm::{entity::prelude::*, sea_query::OnConflict, ActiveValue::Set, TryIntoModel};
+
+use crate::{
+    core::types::{metadata::Metadata, ApplicationId},
+    error,
+};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "applicationmetadata")]

server/svix-server/src/db/models/endpoint.rs

@@ -1,17 +1,18 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
 
-use crate::core::types::{
-    ApplicationId, BaseId, EndpointHeaders, EndpointId, EndpointIdOrUid, EndpointSecretInternal,
-    EndpointUid, EventChannelSet, EventTypeNameSet, ExpiringSigningKeys,
-};
-use crate::error;
 use chrono::Utc;
-use sea_orm::ActiveValue::Set;
-use sea_orm::{entity::prelude::*, Condition};
-use sea_orm::{ConnectionTrait, IntoActiveModel};
+use sea_orm::{entity::prelude::*, ActiveValue::Set, Condition, IntoActiveModel};
 
 use super::endpointmetadata;
+use crate::{
+    core::types::{
+        ApplicationId, BaseId, EndpointHeaders, EndpointId, EndpointIdOrUid,
+        EndpointSecretInternal, EndpointUid, EventChannelSet, EventTypeNameSet,
+        ExpiringSigningKeys,
+    },
+    error,
+};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "endpoint")]

server/svix-server/src/db/models/endpointmetadata.rs

@@ -1,15 +1,13 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
-use crate::core::types::EndpointId;
-
-use crate::core::types::metadata::Metadata;
-use crate::error;
 
 use chrono::Utc;
-use sea_orm::entity::prelude::*;
-use sea_orm::sea_query::OnConflict;
-use sea_orm::ActiveValue::Set;
-use sea_orm::{ConnectionTrait, TryIntoModel};
+use sea_orm::{entity::prelude::*, sea_query::OnConflict, ActiveValue::Set, TryIntoModel};
+
+use crate::{
+    core::types::{metadata::Metadata, EndpointId},
+    error,
+};
 
 #[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel)]
 #[sea_orm(table_name = "endpointmetadata")]