obey clippy

Author: blobcode

src/config.rs

@@ -1,4 +1,5 @@
 use serde::Deserialize;
+use std::error::Error;
 use std::path::PathBuf;
 use std::{collections::HashMap, fs};
 
@@ -31,23 +32,23 @@ fn parsehosts(config: ConfigToml) -> HashMap<String, String> {
     for host in config.host {
         for from in host.from {
             let to = &host.to;
-            hosts.insert(from.to_string(), to.to_string());
+            hosts.insert(from, to.to_string());
         }
     }
     hosts
 }
 
 // main function to get config struct
-pub fn parse(file: PathBuf) -> Config {
+pub fn parse(file: PathBuf) -> Result<Config, Box<dyn Error>> {
     // load config
-    let buf = fs::read_to_string(file).unwrap();
+    let buf = fs::read_to_string(file)?;
 
     // parse file contents
-    let config: ConfigToml = toml::from_str(&buf).unwrap();
+    let config: ConfigToml = toml::from_str(&buf)?;
 
-    // create main config struct
-    Config {
+    // create and return main config struct
+    Ok(Config {
         port: config.port,
         hosts: parsehosts(config),
-    }
+    })
 }

src/main.rs

@@ -7,13 +7,13 @@ mod server;
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
     // logging setup
-    simple_logger::init_with_level(log::Level::Info).unwrap();
+    simple_logger::init_with_level(log::Level::Info)?;
 
     // get args
     let opts = args::parse();
 
     // get config
-    let config = config::parse(opts.path);
+    let config = config::parse(opts.path)?;
 
     // server setup
     let server = server::Server {

src/server.rs

@@ -51,7 +51,7 @@ async fn handle(inbound: TcpStream, hosts: HashMap<String, String>) -> Result<()
     // parse headers
     let p = headers.iter().position(|&h| h.name == "Host").unwrap();
     let host = String::from_utf8_lossy(headers[p].value).to_string();
-    let to = hosts.get(&host).unwrap();
+    let to = &hosts[&host];
 
     // proxy
     let proxy = proxy(inbound, to.to_string()).map(|r| {