chore: organise rust file

order crate and imports

Author: j03-dev

src/catcher.rs

@@ -1,7 +1,8 @@
-use crate::Status;
 use pyo3::prelude::*;
 use pyo3_stub_gen::derive::*;
 
+use crate::Status;
+
 /// A catcher for handling specific HTTP status codes.
 ///
 /// Catchers allow you to provide custom responses for specific HTTP status codes.

src/cors.rs

@@ -1,7 +1,8 @@
-use crate::response::Response;
 use pyo3::prelude::*;
 use pyo3_stub_gen::derive::*;
 
+use crate::response::Response;
+
 /// Cross-Origin Resource Sharing (CORS) configuration.
 ///
 /// This class allows you to configure CORS headers for your server to control

src/jwt.rs

@@ -1,16 +1,15 @@
+use std::str::FromStr;
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
 use jsonwebtoken::errors::ErrorKind;
 use jsonwebtoken::{Algorithm, DecodingKey, EncodingKey, Header, Validation};
 use pyo3::exceptions::PyException;
+use pyo3::prelude::*;
 use pyo3::types::PyDict;
-use pyo3::{exceptions::PyValueError, prelude::*};
 use pyo3_stub_gen::derive::*;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use std::str::FromStr;
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use crate::exceptions::IntoPyException;
 use crate::json;
 
 /// Base class for all JWT related exceptions.
@@ -90,11 +89,10 @@ impl Jwt {
     #[pyo3(signature = (secret, algorithm="HS256"))]
     pub fn new(secret: String, algorithm: &str) -> PyResult<Self> {
         if secret.is_empty() {
-            return Err(PyValueError::new_err("Secret key cannot be empty"));
+            return Err(JwtError::new_err("Secret key cannot be empty"));
         }
-
-        let algorithm = Algorithm::from_str(algorithm).into_py_exception()?;
-
+        let algorithm =
+            Algorithm::from_str(algorithm).map_err(|err| JwtError::new_err(err.to_string()))?;
         Ok(Self { secret, algorithm })
     }
 

src/lib.rs

@@ -1,3 +1,31 @@
+use std::net::SocketAddr;
+use std::ops::Deref;
+use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};
+
+use ahash::HashMap;
+use pyo3::exceptions::PyValueError;
+use pyo3::prelude::*;
+use pyo3::types::{PyDict, PyInt, PyString};
+use pyo3_async_runtimes::tokio::{future_into_py, into_future};
+use pyo3_stub_gen::derive::*;
+use tokio::net::{TcpListener, TcpStream};
+use tokio::sync::Semaphore;
+use tokio::sync::mpsc::{Receiver, Sender, channel};
+
+use catcher::Catcher;
+use cors::Cors;
+use exceptions::IntoPyException;
+use into_response::convert_to_response;
+use middleware::MiddlewareChain;
+use multipart::File;
+use request::{Request, RequestBuilder};
+use response::{FileStreaming, Redirect, Response};
+use routing::*;
+use session::{Session, SessionStore};
+use status::Status;
+use templating::Template;
+
 mod catcher;
 mod cors;
 #[macro_use]
@@ -15,35 +43,6 @@ mod session;
 mod status;
 mod templating;
 
-use std::net::SocketAddr;
-use std::ops::Deref;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, Ordering};
-
-use pyo3::exceptions::PyValueError;
-use pyo3::prelude::*;
-use pyo3::types::{PyDict, PyInt, PyString};
-use pyo3_async_runtimes::tokio::{future_into_py, into_future};
-use pyo3_stub_gen::derive::*;
-
-use ahash::HashMap;
-use tokio::net::{TcpListener, TcpStream};
-use tokio::sync::Semaphore;
-use tokio::sync::mpsc::{Receiver, Sender, channel};
-
-use crate::catcher::Catcher;
-use crate::cors::Cors;
-use crate::exceptions::IntoPyException;
-use crate::into_response::convert_to_response;
-use crate::middleware::MiddlewareChain;
-use crate::multipart::File;
-use crate::request::{Request, RequestBuilder};
-use crate::response::{FileStreaming, Redirect, Response};
-use crate::routing::*;
-use crate::session::{Session, SessionStore};
-use crate::status::Status;
-use crate::templating::Template;
-
 pyo3_stub_gen::define_stub_info_gatherer!(stub_info);
 
 struct ProcessRequest {

src/multipart.rs

@@ -1,10 +1,11 @@
-use crate::IntoPyException;
 use ahash::HashMap;
 use futures_util::stream;
 use hyper::body::Bytes;
 use pyo3::{exceptions::PyValueError, prelude::*, types::PyBytes};
 use pyo3_stub_gen::derive::*;
 
+use crate::IntoPyException;
+
 /// Represents an uploaded file in a multipart/form-data request.
 ///
 /// The File class provides access to uploaded file data, including the file name,

src/response.rs

@@ -1,27 +1,22 @@
-use futures_util::StreamExt;
-use http_body_util::combinators::BoxBody;
-use hyper::body::Frame;
-use hyper::http::HeaderValue;
+use std::convert::Infallible;
+use std::fs;
+use std::io::Read;
+use std::str::{self, FromStr};
+use std::sync::Arc;
+
+use futures_util::{StreamExt, stream};
+use http_body_util::{BodyExt, Full, StreamBody, combinators::BoxBody};
 use hyper::{
     HeaderMap,
-    body::Bytes,
-    header::{CONTENT_TYPE, HeaderName, LOCATION},
+    body::{Bytes, Frame},
+    header::{CACHE_CONTROL, CONTENT_TYPE, HeaderName, LOCATION},
+    http::HeaderValue,
 };
-
-use futures_util::stream;
-use http_body_util::{BodyExt, Full, StreamBody};
-use hyper::header::CACHE_CONTROL;
 use pyo3::exceptions::PyTypeError;
 use pyo3::prelude::*;
 use pyo3::types::{PyBytes, PyString};
 use pyo3_stub_gen::derive::*;
 
-use std::convert::Infallible;
-use std::fs;
-use std::io::Read;
-use std::str::{self, FromStr};
-use std::sync::Arc;
-
 use crate::{Cors, IntoPyException, ProcessRequest, Request, Status, convert_to_response, json};
 
 pub type Body = BoxBody<Bytes, Infallible>;

src/serializer/mod.rs

@@ -1,12 +1,6 @@
-mod fields;
-
 use std::sync::{Arc, Mutex};
 
 use ahash::HashMap;
-
-use self::fields::*;
-use crate::{IntoPyException, exceptions::ClientError, json};
-
 use pyo3::{
     IntoPyObjectExt,
     exceptions::PyException,
@@ -17,6 +11,11 @@ use pyo3::{
 use pyo3_stub_gen::derive::*;
 use serde_json::{Map, Value, json};
 
+use self::fields::*;
+use crate::{IntoPyException, exceptions::ClientError, json};
+
+mod fields;
+
 static SQL_ALCHEMY_INSPECT: PyOnceLock<Py<PyAny>> = PyOnceLock::new();
 
 #[gen_stub_pyclass]

src/templating/minijinja.rs

@@ -1,9 +1,9 @@
-use ahash::HashMap;
+use std::sync::Arc;
 
+use ahash::HashMap;
 use minijinja::Environment;
 use pyo3::{prelude::*, types::PyDict};
 use pyo3_stub_gen::derive::*;
-use std::sync::Arc;
 
 use crate::IntoPyException;
 use crate::json;

src/templating/mod.rs

@@ -1,17 +1,18 @@
-use crate::{
-    request::Request,
-    response::{Response, ResponseBody},
-    status::Status,
-};
-use hyper::{header::CONTENT_TYPE, HeaderMap};
+use hyper::{HeaderMap, header::CONTENT_TYPE};
 use pyo3::{
+    Bound, PyResult,
     exceptions::{PyException, PyValueError},
     prelude::*,
     types::{PyDict, PyModule, PyModuleMethods},
-    Bound, PyResult,
 };
 use pyo3_stub_gen::derive::*;
 
+use crate::{
+    request::Request,
+    response::{Response, ResponseBody},
+    status::Status,
+};
+
 mod minijinja;
 mod tera;
 

src/templating/tera.rs

@@ -1,11 +1,12 @@
 use std::sync::Arc;
 
-use crate::IntoPyException;
-use crate::json;
 use ahash::HashMap;
 use pyo3::{prelude::*, types::PyDict};
 use pyo3_stub_gen::derive::*;
 
+use crate::IntoPyException;
+use crate::json;
+
 #[gen_stub_pyclass]
 #[pyclass(module = "oxapy.templating")]
 #[derive(Debug, Clone)]