about summary refs log tree commit diff
path: root/web/converse/src/handlers.rs
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-04-05T18·00+0200
committertazjin <mail@tazj.in>2021-04-05T19·19+0000
commit8fc4e083c9c5f1dce759461dc4c45e26151a3ad1 (patch)
tree1967037f3947a09eb139320bdaa53fc0e08ae430 /web/converse/src/handlers.rs
parenta0c4b91955662297ec5bd9249a9488ea6d52defc (diff)
chore(web/converse): Apply 'cargo fix --edition' r/2444
This does not yet change up `extern crate` and `macro_use` statements,
but since we still depend on Diesel that also wouldn't work right now.

Change-Id: I36de1b7b56f7d220f567346e13bad8da06461517
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2858
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'web/converse/src/handlers.rs')
-rw-r--r--web/converse/src/handlers.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/web/converse/src/handlers.rs b/web/converse/src/handlers.rs
index d558afbe1242..d984fc71374b 100644
--- a/web/converse/src/handlers.rs
+++ b/web/converse/src/handlers.rs
@@ -29,15 +29,15 @@ use actix_web::http::Method;
 use actix_web::middleware::identity::RequestIdentity;
 use actix_web::middleware::{Started, Middleware};
 use actix_web;
-use db::*;
-use errors::ConverseError;
+use crate::db::*;
+use crate::errors::ConverseError;
 use futures::Future;
 use mime_guess::guess_mime_type;
-use models::*;
-use oidc::*;
-use render::*;
+use crate::models::*;
+use crate::oidc::*;
+use crate::render::*;
 
-type ConverseResponse = Box<Future<Item=HttpResponse, Error=ConverseError>>;
+type ConverseResponse = Box<dyn Future<Item=HttpResponse, Error=ConverseError>>;
 
 const HTML: &'static str = "text/html";
 const ANONYMOUS: i32 = 1;
@@ -288,7 +288,7 @@ pub fn login(state: State<AppState>) -> ConverseResponse {
 /// otherwise a new user is created.
 pub fn callback(state: State<AppState>,
                 data: Form<CodeResponse>,
-                mut req: HttpRequest<AppState>) -> ConverseResponse {
+                req: HttpRequest<AppState>) -> ConverseResponse {
     state.oidc.send(RetrieveToken(data.0)).flatten()
         .map(|author| LookupOrCreateUser {
             email: author.email,