actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2025-06-28 18:00:37 +02:00
Code Issues Releases Wiki Activity

upgrade actix-web to 0.6

Browse Source
This commit is contained in:
Nikolay Kim
2018-05-08 11:08:43 -07:00
parent 27de52b5d5
commit bbeb262a5c
55 changed files with 689 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
template_askama/Cargo.toml
View File

@ -7,8 +7,8 @@ workspace = "../"
[dependencies]
env_logger = "0.5"
actix = "0.5"
actix-web = "^0.5"
actix-web = "^0.6"
askama = "0.6"
[build-dependencies]
askama = "0.6"
askama = "0.6"

16
template_askama/src/main.rs
View File

@ -3,8 +3,9 @@ extern crate actix_web;
#[macro_use]
extern crate askama;
use actix::prelude::*;
use actix_web::{http, server, App, HttpRequest, HttpResponse, Result};
use std::collections::HashMap;
use actix_web::{http, server, App, HttpResponse, Query, Result};
use askama::Template;
#[derive(Template)]
@ -18,8 +19,8 @@ struct UserTemplate<'a> {
#[template(path = "index.html")]
struct Index;
fn index(req: HttpRequest) -> Result<HttpResponse> {
let s = if let Some(name) = req.query().get("name") {
fn index(query: Query<HashMap<String, String>>) -> Result<HttpResponse> {
let s = if let Some(name) = query.get("name") {
UserTemplate {
name: name,
text: "Welcome!",
@ -32,11 +33,12 @@ fn index(req: HttpRequest) -> Result<HttpResponse> {
}
fn main() {
let sys = System::new("template-askama");
let sys = actix::System::new("template-askama");
// start http server
server::new(move || App::new().resource("/", |r| r.method(http::Method::GET).f(index)))
.bind("0.0.0.0:8080")
server::new(move || {
App::new().resource("/", |r| r.method(http::Method::GET).with(index))
}).bind("0.0.0.0:8080")
.unwrap()
.start();