Mirrors/polaris
2
0
Fork 0
mirror of https://github.com/agersant/polaris synced 2024-12-04 10:39:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed unneeded mutability

Browse source
This commit is contained in:
Antoine Gersant 2016-10-23 11:47:57 -07:00
parent 1097640764
commit bb66b3a566
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/api.rs
View file

@ -1,5 +1,4 @@
use core::str::Utf8Error; use core::str::Utf8Error;
use core::ops::DerefMut;
use std::fs; use std::fs;
use std::io; use std::io;
use std::path::PathBuf; use std::path::PathBuf;
@ -59,22 +58,22 @@ pub fn get_api_handler(collection: Arc<Mutex<Collection>>) -> Mount {
{ {
let collection = collection.clone(); let collection = collection.clone();
auth_api_mount.mount("/browse/", move |request: &mut Request| { auth_api_mount.mount("/browse/", move |request: &mut Request| {
let mut acquired_collection = collection.deref().lock().unwrap(); let acquired_collection = collection.deref().lock().unwrap();
self::browse(request, acquired_collection.deref_mut()) self::browse(request, acquired_collection.deref())
}); });
} }
{ {
let collection = collection.clone(); let collection = collection.clone();
auth_api_mount.mount("/flatten/", move |request: &mut Request| { auth_api_mount.mount("/flatten/", move |request: &mut Request| {
let mut acquired_collection = collection.deref().lock().unwrap(); let acquired_collection = collection.deref().lock().unwrap();
self::flatten(request, acquired_collection.deref_mut()) self::flatten(request, acquired_collection.deref())
}); });
} }
{ {
let collection = collection.clone(); let collection = collection.clone();
auth_api_mount.mount("/serve/", move |request: &mut Request| { auth_api_mount.mount("/serve/", move |request: &mut Request| {
let mut acquired_collection = collection.deref().lock().unwrap(); let acquired_collection = collection.deref().lock().unwrap();
self::serve(request, acquired_collection.deref_mut()) self::serve(request, acquired_collection.deref())
}); });
} }
@ -125,7 +124,7 @@ fn auth(request: &mut Request, collection: &Collection) -> IronResult<Response>
} }
} }
fn browse(request: &mut Request, collection: &mut Collection) -> IronResult<Response> { fn browse(request: &mut Request, collection: &Collection) -> IronResult<Response> {
let path = path_from_request(request); let path = path_from_request(request);
let path = match path { let path = match path {
Err(e) => return Err(IronError::new(e, status::BadRequest)), Err(e) => return Err(IronError::new(e, status::BadRequest)),
@ -142,7 +141,7 @@ fn browse(request: &mut Request, collection: &mut Collection) -> IronResult<Resp
Ok(Response::with((status::Ok, result_json))) Ok(Response::with((status::Ok, result_json)))
} }
fn flatten(request: &mut Request, collection: &mut Collection) -> IronResult<Response> { fn flatten(request: &mut Request, collection: &Collection) -> IronResult<Response> {
let path = path_from_request(request); let path = path_from_request(request);
let path = match path { let path = match path {
Err(e) => return Err(IronError::new(e, status::BadRequest)), Err(e) => return Err(IronError::new(e, status::BadRequest)),
@ -159,7 +158,7 @@ fn flatten(request: &mut Request, collection: &mut Collection) -> IronResult<Res
Ok(Response::with((status::Ok, result_json))) Ok(Response::with((status::Ok, result_json)))
} }
fn serve(request: &mut Request, collection: &mut Collection) -> IronResult<Response> { fn serve(request: &mut Request, collection: &Collection) -> IronResult<Response> {
let virtual_path = path_from_request(request); let virtual_path = path_from_request(request);
let virtual_path = match virtual_path { let virtual_path = match virtual_path {
Err(e) => return Err(IronError::new(e, status::BadRequest)), Err(e) => return Err(IronError::new(e, status::BadRequest)),