Removed try_trait and some formatting, particularly around imports

This commit is contained in:
Daniel García
2020-07-14 18:00:09 +02:00
parent fb6f96f5c3
commit 668d5c23dc
25 changed files with 251 additions and 272 deletions

View File

@ -4,11 +4,12 @@ use rocket::Route;
use rocket_contrib::json::Json;
use serde_json::Value as JsonValue;
use crate::api::{EmptyResult, JsonResult};
use crate::auth::Headers;
use crate::db::DbConn;
use crate::{Error, CONFIG};
use crate::{
api::{EmptyResult, JsonResult},
auth::Headers,
db::DbConn,
Error, CONFIG,
};
pub fn routes() -> Vec<Route> {
routes![negotiate, websockets_err]
@ -163,7 +164,7 @@ impl Handler for WSHandler {
let mut id = None;
let mut access_token = None;
for val in params_iter {
if val.starts_with(ID_KEY) {
id = Some(&val[ID_KEY.len()..]);