projects
/
rup.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to last version of actix-web.
[rup.git]
/
src
/
main.rs
diff --git
a/src/main.rs
b/src/main.rs
index
3056267
..
15b9c02
100644
(file)
--- 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 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::*;
use askama::Template;
use std::io::prelude::*;
@@
-29,7
+29,7
@@
pub struct Request {
m: Option<String>
}
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) =>
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();
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)]
}
#[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(()) }
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.bind(&format!("0.0.0.0:{}", config.port)).unwrap()
};
- server.run()
+ server.run()
.await
}
fn process_args(key: &str) -> bool {
}
fn process_args(key: &str) -> bool {