diff options
| author | Jokler <jokler@protonmail.com> | 2020-09-29 15:18:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 15:18:47 +0200 |
| commit | e44a251fe0e1b82c859515768e483f19b1b5aaf3 (patch) | |
| tree | 6092b3db497ee0a795f70db695ff2adb3c16e5ee /src/web_server | |
| parent | 130cde033795382b70a312846a8f2704a15d11e3 (diff) | |
| parent | bbe3e1fffc94e7e87237a331de7b09253b0aa3fb (diff) | |
| download | pokebot-e44a251fe0e1b82c859515768e483f19b1b5aaf3.tar.gz pokebot-e44a251fe0e1b82c859515768e483f19b1b5aaf3.zip | |
Merge pull request #59 from Mavulp/update-dependencies
Upgrade dependencies & use tokio 0.2 exclusively
Diffstat (limited to 'src/web_server')
| -rw-r--r-- | src/web_server/bot_executor.rs | 4 | ||||
| -rw-r--r-- | src/web_server/default.rs | 2 | ||||
| -rw-r--r-- | src/web_server/tmtu.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/web_server/bot_executor.rs b/src/web_server/bot_executor.rs index fde3c08..0d3e7b7 100644 --- a/src/web_server/bot_executor.rs +++ b/src/web_server/bot_executor.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use actix::{Actor, Handler, Message, SyncContext}; +use actix::{Actor, Context, Handler, Message}; use crate::bot::MasterBot; use crate::web_server::BotData; @@ -8,7 +8,7 @@ use crate::web_server::BotData; pub struct BotExecutor(pub Arc<MasterBot>); impl Actor for BotExecutor { - type Context = SyncContext<Self>; + type Context = Context<Self>; } pub struct BotNameListRequest; diff --git a/src/web_server/default.rs b/src/web_server/default.rs index ec86182..542dade 100644 --- a/src/web_server/default.rs +++ b/src/web_server/default.rs @@ -1,7 +1,7 @@ use actix::Addr; use actix_web::{http::header, web, Error, HttpResponse}; -use askama::actix_web::TemplateIntoResponse; use askama::Template; +use askama_actix::TemplateIntoResponse; use crate::web_server::{filters, BotData, BotDataRequest, BotExecutor, BotNameListRequest}; diff --git a/src/web_server/tmtu.rs b/src/web_server/tmtu.rs index 0645ee4..33a14af 100644 --- a/src/web_server/tmtu.rs +++ b/src/web_server/tmtu.rs @@ -1,7 +1,7 @@ use actix::Addr; use actix_web::{http::header, web, Error, HttpResponse}; -use askama::actix_web::TemplateIntoResponse; use askama::Template; +use askama_actix::TemplateIntoResponse; use crate::web_server::{filters, BotData, BotDataRequest, BotExecutor, BotNameListRequest}; |
