From 27f7e8f35c40c3b8563806e9755565722a217204 Mon Sep 17 00:00:00 2001
From: Valentin Brandl <vbrandl@riseup.net>
Date: Fri, 26 Jul 2019 14:21:17 +0200
Subject: [PATCH] Don't use import alias

---
 src/main.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index c934b32..93c39a9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,7 +15,7 @@ use crate::{
 };
 use actix_web::{
     http::header::{self, CacheControl, CacheDirective, Expires, LOCATION},
-    middleware, web, App, Error as AError, HttpResponse, HttpServer,
+    middleware, web, App, Error, HttpResponse, HttpServer,
 };
 use awc::{http::StatusCode, Client};
 use futures::Future;
@@ -24,7 +24,7 @@ use std::time::{Duration, SystemTime};
 fn proxy_file<T: Service>(
     client: web::Data<Client>,
     data: web::Path<FilePath>,
-) -> Box<dyn Future<Item = HttpResponse, Error = AError>> {
+) -> Box<dyn Future<Item = HttpResponse, Error = Error>> {
     Box::new(
         client
             .get(&T::raw_url(
@@ -57,7 +57,7 @@ fn proxy_file<T: Service>(
 fn redirect<T: Service>(
     client: web::Data<Client>,
     data: web::Path<FilePath>,
-) -> Box<dyn Future<Item = HttpResponse, Error = AError>> {
+) -> Box<dyn Future<Item = HttpResponse, Error = Error>> {
     Box::new(
         client
             .get(&T::api_url(&data))
@@ -84,9 +84,9 @@ fn redirect<T: Service>(
                         })
                         .from_err(),
                 )
-                    as Box<dyn Future<Item = HttpResponse, Error = AError>>,
+                    as Box<dyn Future<Item = HttpResponse, Error = Error>>,
                 code => Box::new(futures::future::ok(HttpResponse::build(code).finish()))
-                    as Box<dyn Future<Item = HttpResponse, Error = AError>>,
+                    as Box<dyn Future<Item = HttpResponse, Error = Error>>,
             }),
     )
 }
@@ -94,7 +94,7 @@ fn redirect<T: Service>(
 fn handle_request<T: Service>(
     client: web::Data<Client>,
     data: web::Path<FilePath>,
-) -> Box<dyn Future<Item = HttpResponse, Error = AError>> {
+) -> Box<dyn Future<Item = HttpResponse, Error = Error>> {
     if data.commit.len() == 40 {
         proxy_file::<T>(client, data)
     } else {