style: run rustfmt

This commit is contained in:
Compositr 2024-11-03 21:34:07 +11:00
parent 244463ee29
commit d554e688e2
4 changed files with 13 additions and 11 deletions

View file

@ -6,7 +6,9 @@ use crate::{
threads::ThreadPool, threads::ThreadPool,
}; };
use std::{ use std::{
collections::HashMap, net::{Shutdown, TcpListener}, sync::Arc collections::HashMap,
net::{Shutdown, TcpListener},
sync::Arc,
}; };
type DynHandlerFn = dyn Fn(Request) -> Response + Send + Sync; type DynHandlerFn = dyn Fn(Request) -> Response + Send + Sync;

View file

@ -1,2 +1,2 @@
pub mod requests;
pub mod responses; pub mod responses;
pub mod requests;

View file

@ -16,7 +16,7 @@ pub struct Response {
impl Response { impl Response {
/// Create a new response from a request /// Create a new response from a request
/// ///
/// request: the request to respond to /// request: the request to respond to
/// status: the HTTP status code /// status: the HTTP status code
/// body: the body of the response (see Body enum) /// body: the body of the response (see Body enum)
@ -29,7 +29,7 @@ impl Response {
} }
/// Send off this response (write to the stream) /// Send off this response (write to the stream)
/// ///
/// Consumes the response and returns a Result with either () or a Boxed Error /// Consumes the response and returns a Result with either () or a Boxed Error
pub fn send(self) -> UnitOrBoxedError { pub fn send(self) -> UnitOrBoxedError {
send_response(self.request.mut_stream(), self.status, self.body) send_response(self.request.mut_stream(), self.status, self.body)

View file

@ -34,10 +34,10 @@ impl Icons {
} }
/// Check if the icon exists /// Check if the icon exists
/// ///
/// Cheap; does not actually call the fs - instead checks against the cached filenames in the Vec internal to this struct. /// Cheap; does not actually call the fs - instead checks against the cached filenames in the Vec internal to this struct.
/// Therefore, it is not guaranteed to be up-to-date with the actual filesystem /// Therefore, it is not guaranteed to be up-to-date with the actual filesystem
/// ///
/// icon: the icon name to check (no .svg extension) /// icon: the icon name to check (no .svg extension)
pub fn has_iconname(&self, icon: &str) -> bool { pub fn has_iconname(&self, icon: &str) -> bool {
self.icon_filenames self.icon_filenames
@ -50,16 +50,16 @@ impl Icons {
} }
/// Get the number of icons /// Get the number of icons
/// ///
/// Cheap; does not actually call the fs - instead returns the length of the cached filenames in the Vec internal to this struct. /// Cheap; does not actually call the fs - instead returns the length of the cached filenames in the Vec internal to this struct.
pub fn icons_len(&self) -> usize { pub fn icons_len(&self) -> usize {
self.icon_filenames.len() self.icon_filenames.len()
} }
/// Read an .svg icon from disk to a Vec<u8> /// Read an .svg icon from disk to a Vec<u8>
/// ///
/// You may want to check if the icon exists first with has_iconname(), although that method does not guarantee the icon is still present on the disk. /// You may want to check if the icon exists first with has_iconname(), although that method does not guarantee the icon is still present on the disk.
/// ///
/// icon: the icon name to read (no .svg extension) /// icon: the icon name to read (no .svg extension)
pub fn get_icon(&self, icon: &str) -> Option<Vec<u8>> { pub fn get_icon(&self, icon: &str) -> Option<Vec<u8>> {
let icon_path = format!("{}/{}.svg", self.icons_dir_path, icon); let icon_path = format!("{}/{}.svg", self.icons_dir_path, icon);
@ -67,9 +67,9 @@ impl Icons {
} }
/// Read an .svg icon from disk to a String, instead of a Vec<u8> /// Read an .svg icon from disk to a String, instead of a Vec<u8>
/// ///
/// You may want to check if the icon exists first with has_iconname(), although that method does not guarantee the icon is still present on the disk. /// You may want to check if the icon exists first with has_iconname(), although that method does not guarantee the icon is still present on the disk.
/// ///
/// icon: the icon name to read (no .svg extension) /// icon: the icon name to read (no .svg extension)
pub fn get_icon_string(&self, icon: &str) -> Option<String> { pub fn get_icon_string(&self, icon: &str) -> Option<String> {
let icon_path = format!("{}/{}.svg", self.icons_dir_path, icon); let icon_path = format!("{}/{}.svg", self.icons_dir_path, icon);