X-Git-Url: http://git.euphorik.ch/?p=rup.git;a=blobdiff_plain;f=src%2Fmain.rs;fp=src%2Fmain.rs;h=15b9c025f67bb86acb9d93be0d2b1e89c0272c07;hp=3056267c2df25d5dbc9642c0c50e063a979bf00e;hb=331dddcaef970033db01dc9d239818417ed2e750;hpb=f43bab0b61b36e53135569727476fc6f39a3deec

diff --git a/src/main.rs b/src/main.rs
index 3056267..15b9c02 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,7 @@ extern crate percent_encoding;
 
 use listenfd::ListenFd;
 use actix_files as fs;
-use actix_web::{web, middleware, App, HttpServer, HttpResponse, Result, web::Query};
+use actix_web::{web, middleware, App, HttpServer, HttpResponse, web::Query};
 use askama::Template;
 
 use std::io::prelude::*;
@@ -29,7 +29,7 @@ pub struct Request {
    m: Option<String>
 }
 
-fn main_page(query: Query<Request>, key: &str) -> Result<HttpResponse> {
+fn main_page(query: Query<Request>, key: &str) -> HttpResponse {
     let m =
         match &query.m {
             Some(b) =>
@@ -43,7 +43,7 @@ fn main_page(query: Query<Request>, key: &str) -> Result<HttpResponse> {
     let hello = MainTemplate { sentence: &m };
 
     let s = hello.render().unwrap();
-    Ok(HttpResponse::Ok().content_type("text/html").body(s))
+    HttpResponse::Ok().content_type("text/html").body(s)
 }
 
 #[derive(Debug, Deserialize)]
@@ -71,7 +71,8 @@ fn read_key() -> String {
     )
 }
 
-fn main() -> std::io::Result<()> {
+#[actix_rt::main]
+async fn main() -> std::io::Result<()> {
     let key = read_key();
 
     if process_args(&key) { return Ok(()) }
@@ -109,7 +110,7 @@ fn main() -> std::io::Result<()> {
             server.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
         };
 
-    server.run()
+    server.run().await
 }
 
 fn process_args(key: &str) -> bool {