Remove redundant imports and reformat imports

Some symbols that were covered by prelude::* imports were also imported
explicitly. Remove the explicit imports to fix warnings on nightly.
Also reformat the imports of the affected modules to have one uniform
style (one `use` statement per crate, grouped by std, external,
internal).

Author: svix-jplatte

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")]

server/svix-server/src/v1/endpoints/attempt.rs

@@ -3,6 +3,23 @@
 
 use std::collections::HashMap;
 
+use aide::axum::{
+    routing::{delete_with, get_with, post_with},
+    ApiRouter,
+};
+use axum::{
+    extract::{Path, State},
+    Json,
+};
+use chrono::{DateTime, Utc};
+use hyper::StatusCode;
+use schemars::JsonSchema;
+use sea_orm::{entity::prelude::*, IntoActiveModel, QueryOrder, QuerySelect};
+use serde::{Deserialize, Deserializer, Serialize};
+use serde_json::value::RawValue;
+use svix_server_derive::{aide_annotate, ModelOut};
+use validator::Validate;
+
 use crate::{
     core::{
         permissions,
@@ -12,7 +29,7 @@ use crate::{
             StatusCodeClass,
         },
     },
-    db::models::{endpoint, message, messagecontent, messagedestination},
+    db::models::{endpoint, message, messageattempt, messagecontent, messagedestination},
     error::{Error, HttpError, Result},
     queue::MessageTask,
     v1::{
@@ -26,29 +43,6 @@ use crate::{
     },
     AppState,
 };
-use aide::axum::{
-    routing::{delete_with, get_with, post_with},
-    ApiRouter,
-};
-use axum::{
-    extract::{Path, State},
-    Json,
-};
-use chrono::{DateTime, Utc};
-
-use hyper::StatusCode;
-use schemars::JsonSchema;
-use sea_orm::{
-    entity::prelude::*, sea_query::Expr, DatabaseConnection, IntoActiveModel, QueryOrder,
-    QuerySelect,
-};
-use serde::{Deserialize, Deserializer, Serialize};
-
-use serde_json::value::RawValue;
-use svix_server_derive::{aide_annotate, ModelOut};
-use validator::Validate;
-
-use crate::db::models::messageattempt;
 
 fn example_status_code() -> i16 {
     200
@@ -933,13 +927,14 @@ pub fn router() -> ApiRouter<AppState> {
 
 #[cfg(test)]
 mod tests {
+    use serde_json::json;
+    use validator::Validate;
+
     use super::{
         AttemptListFetchQueryParams, ListAttemptedMessagesQueryParams,
         ListAttemptsByEndpointQueryParams, ListAttemptsByMsgQueryParams,
         ListAttemptsForEndpointQueryParams,
     };
-    use serde_json::json;
-    use validator::Validate;
 
     const INVALID_CHANNEL: &str = "$$invalid-channel";
     const VALID_CHANNEL: &str = "valid-channel";

server/svix-server/src/v1/endpoints/endpoint/crud.rs

@@ -4,13 +4,12 @@ use axum::{
     extract::{Path, State},
     Json,
 };
-use sea_orm::{entity::prelude::*, ActiveValue::Set, TransactionTrait};
-use sea_orm::{ActiveModelTrait, DatabaseConnection, QuerySelect};
+use sea_orm::{entity::prelude::*, ActiveValue::Set, QuerySelect, TransactionTrait};
 use svix_server_derive::aide_annotate;
 use url::Url;
 
+use self::hack::EventTypeNameResult;
 use super::{EndpointIn, EndpointOut, EndpointPatch, EndpointUpdate};
-use crate::error::Traceable;
 use crate::{
     cfg::Configuration,
     core::{
@@ -19,7 +18,7 @@ use crate::{
         types::{EndpointId, EventTypeName, EventTypeNameSet, OrganizationId},
     },
     db::models::{application, endpoint, endpointmetadata, eventtype},
-    error::{http_error_on_conflict, HttpError, Result, ValidationErrorItem},
+    error::{http_error_on_conflict, HttpError, Result, Traceable, ValidationErrorItem},
     v1::utils::{
         apply_pagination,
         patch::{patch_field_non_nullable, UnrequiredField, UnrequiredNullableField},
@@ -29,7 +28,6 @@ use crate::{
     },
     AppState,
 };
-use hack::EventTypeNameResult;
 
 /// List the application's endpoints.
 #[aide_annotate(op_id = "v1.endpoint.list")]

server/svix-server/src/v1/endpoints/endpoint/recovery.rs

@@ -1,11 +1,9 @@
 use axum::extract::{Path, State};
 use chrono::{DateTime, Utc};
-use sea_orm::{entity::prelude::*, QueryOrder};
-use sea_orm::{DatabaseConnection, QuerySelect};
+use sea_orm::{entity::prelude::*, QueryOrder, QuerySelect};
 use svix_server_derive::aide_annotate;
 
 use super::RecoverIn;
-use crate::v1::utils::NoContentWithCode;
 use crate::{
     core::{
         permissions,
@@ -14,7 +12,7 @@ use crate::{
     db::models::{application, endpoint, messagedestination},
     error::{HttpError, Result, ValidationErrorItem},
     queue::{MessageTask, TaskQueueProducer},
-    v1::utils::{ApplicationEndpointPath, ValidatedJson},
+    v1::utils::{ApplicationEndpointPath, NoContentWithCode, ValidatedJson},
     AppState,
 };
 

server/svix-server/src/v1/endpoints/event_type.rs

@@ -1,6 +1,21 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
 
+use aide::axum::{
+    routing::{get_with, post_with},
+    ApiRouter,
+};
+use axum::{
+    extract::{Path, State},
+    Json,
+};
+use chrono::{DateTime, Utc};
+use schemars::JsonSchema;
+use sea_orm::{entity::prelude::*, ActiveValue::Set};
+use serde::{Deserialize, Serialize};
+use svix_server_derive::{aide_annotate, ModelIn, ModelOut};
+use validator::Validate;
+
 use crate::{
     core::{
         permissions,
@@ -21,20 +36,6 @@ use crate::{
     },
     AppState,
 };
-use aide::axum::{
-    routing::{get_with, post_with},
-    ApiRouter,
-};
-use axum::{
-    extract::{Path, State},
-    Json,
-};
-use chrono::{DateTime, Utc};
-use schemars::JsonSchema;
-use sea_orm::{entity::prelude::*, ActiveModelTrait, ActiveValue::Set};
-use serde::{Deserialize, Serialize};
-use svix_server_derive::{aide_annotate, ModelIn, ModelOut};
-use validator::Validate;
 
 fn example_event_archived() -> bool {
     false
@@ -440,9 +441,10 @@ pub fn router() -> ApiRouter<AppState> {
 #[cfg(test)]
 mod tests {
 
-    use super::ListFetchQueryParams;
     use serde_json::json;
 
+    use super::ListFetchQueryParams;
+
     #[test]
     fn test_list_fetch_options_default() {
         let l: ListFetchQueryParams = serde_json::from_value(json!({})).unwrap();

server/svix-server/src/v1/endpoints/message.rs

@@ -1,6 +1,24 @@
 // SPDX-FileCopyrightText: © 2022 Svix Authors
 // SPDX-License-Identifier: MIT
 
+use aide::axum::{
+    routing::{delete_with, get_with, post_with},
+    ApiRouter,
+};
+use axum::{
+    extract::{Path, State},
+    Json,
+};
+use chrono::{DateTime, Duration, Utc};
+use futures::FutureExt;
+use hyper::StatusCode;
+use schemars::JsonSchema;
+use sea_orm::{entity::prelude::*, ActiveValue::Set, IntoActiveModel, TransactionTrait};
+use serde::{Deserialize, Serialize};
+use serde_json::value::RawValue;
+use svix_server_derive::{aide_annotate, ModelIn, ModelOut};
+use validator::{Validate, ValidationError};
+
 use crate::{
     core::{
         cache::Cache,
@@ -11,8 +29,8 @@ use crate::{
             MessageAttemptTriggerType, MessageId, MessageUid,
         },
     },
-    db::models::{application, messagecontent},
-    error::{HttpError, Result},
+    db::models::{application, message, messagecontent},
+    error::{Error, HttpError, Result},
     queue::{MessageTaskBatch, TaskQueueProducer},
     v1::utils::{
         apply_pagination_desc, iterator_from_before_or_after, openapi_tag, validation_error,
@@ -21,29 +39,6 @@ use crate::{
     },
     AppState,
 };
-use aide::axum::{
-    routing::{delete_with, get_with, post_with},
-    ApiRouter,
-};
-use axum::{
-    extract::{Path, State},
-    Json,
-};
-use chrono::{DateTime, Duration, Utc};
-use futures::FutureExt;
-use hyper::StatusCode;
-use schemars::JsonSchema;
-use sea_orm::{entity::prelude::*, IntoActiveModel};
-use sea_orm::{sea_query::Expr, ActiveValue::Set};
-use sea_orm::{ActiveModelTrait, TransactionTrait};
-use serde::{Deserialize, Serialize};
-
-use serde_json::value::RawValue;
-use svix_server_derive::{aide_annotate, ModelIn, ModelOut};
-use validator::{Validate, ValidationError};
-
-use crate::db::models::message;
-use crate::error::Error;
 
 pub fn validate_channels_msg(channels: &EventChannelSet) -> Result<(), ValidationError> {
     let len = channels.0.len();
@@ -473,12 +468,13 @@ pub fn router() -> ApiRouter<AppState> {
 
 #[cfg(test)]
 mod tests {
+    use serde_json::json;
+    use validator::Validate;
+
     use super::{
         default_true, CreateMessageQueryParams, GetMessageQueryParams, ListMessagesQueryParams,
         MessageIn,
     };
-    use serde_json::json;
-    use validator::Validate;
 
     const CHANNEL_INVALID: &str = "$$invalid-channel";
     const CHANNEL_VALID: &str = "valid-channel";