From 00b4d4cb77a18bf4848ac24554da3e1b377d85b9 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Wed, 17 Aug 2016 00:37:32 -0700
Subject: [PATCH] Minor cleanup

---
 src/api/mod.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/api/mod.rs b/src/api/mod.rs
index 674bca5..7eb8445 100644
--- a/src/api/mod.rs
+++ b/src/api/mod.rs
@@ -1,13 +1,13 @@
 use core::str::Utf8Error;
 use std::path::PathBuf;
+use std::ops::Deref;
 
 use iron::prelude::*;
 use iron::status;
 use mount::Mount;
 use url::percent_encoding::percent_decode;
 
-use collection::browse as collection_browse;
-use collection::flatten as collection_flatten;
+use collection;
 
 pub fn get_api_handler() -> Mount {
     let mut mount = Mount::new();
@@ -19,7 +19,7 @@ pub fn get_api_handler() -> Mount {
 fn path_from_request(request: &Request) -> Result<PathBuf, Utf8Error> {
     let path_string = request.url.path().join("/");
     let decoded_path = percent_decode(path_string.as_bytes()).decode_utf8();
-    decoded_path.map(|s| PathBuf::from(s.into_owned()))
+    decoded_path.map(|s| PathBuf::from(s.deref()))
 }
 
 fn browse(request: &mut Request) -> IronResult<Response> {
@@ -27,7 +27,7 @@ fn browse(request: &mut Request) -> IronResult<Response> {
     if path.is_err() {
         return Ok(Response::with((status::BadRequest)));
     }
-    collection_browse(&path.unwrap());
+    collection::browse(&path.unwrap());
     Ok(Response::with((status::Ok, "TODO browse data here")))
 }
 
@@ -36,6 +36,6 @@ fn flatten(request: &mut Request) -> IronResult<Response> {
     if path.is_err() {
         return Ok(Response::with((status::BadRequest)));
     }
-    collection_flatten(&path.unwrap());
+    collection::flatten(&path.unwrap());
     Ok(Response::with((status::Ok, "TODO Flatten data here")))
 }