From 51f0fc3108842dc0bf4eb83dcf0f89aba59f0346 Mon Sep 17 00:00:00 2001 From: Lucien Cartier-Tilet Date: Wed, 18 Jan 2023 11:31:34 +0100 Subject: [PATCH] Remove last unwrap from ordabok --- src/main.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main.rs b/src/main.rs index a680039..c5fa51a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ mod appwrite; mod db; mod graphql; -use std::{env, error::Error}; +use std::{collections::HashSet, env, error::Error}; use dotenvy::dotenv; use tracing::{debug, info, Level}; @@ -19,13 +19,13 @@ fn setup_logging() { } fn make_cors() -> Result { - use rocket_cors::{AllowedHeaders, AllowedOrigins}; - use std::str::FromStr; + use rocket::http::Method as HMethod; + use rocket_cors::{AllowedHeaders, AllowedOrigins, Method}; rocket_cors::CorsOptions { - allowed_methods: ["Get", "Post"] - .iter() - .map(|s| FromStr::from_str(s).unwrap()) - .collect(), + allowed_methods: HashSet::from([ + Method::from(HMethod::Get), + Method::from(HMethod::Post), + ]), allowed_headers: AllowedHeaders::some(&["Authorization", "Accept"]), allowed_origins: match env::var("ORDABOK_HOSTS") { Ok(val) => {