From 0f0fce66cefe0e5ec04932db0f5bdb456d1efd82 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Mon, 10 Jul 2017 22:27:45 -0700
Subject: [PATCH] Fixed import warnings

---
 src/index.rs    | 8 ++++++--
 src/playlist.rs | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/index.rs b/src/index.rs
index ec50806..58e34fe 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -6,14 +6,18 @@ use diesel::sqlite::SqliteConnection;
 use diesel::types;
 use regex::Regex;
 use std::fs;
-use std::path::{Path, PathBuf};
+use std::path::Path;
+#[cfg(test)]
+use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use std::sync::mpsc::*;
 use std::thread;
 use std::time;
 
 use config::MiscSettings;
-use db::{self, ConnectionSource};
+#[cfg(test)]
+use db;
+use db::ConnectionSource;
 use db::{directories, misc_settings, songs};
 use vfs::{VFS, VFSSource};
 use errors::*;
diff --git a/src/playlist.rs b/src/playlist.rs
index a687a72..7914b3b 100644
--- a/src/playlist.rs
+++ b/src/playlist.rs
@@ -5,8 +5,9 @@ use diesel::prelude::*;
 use diesel::BelongingToDsl;
 use std::collections::HashMap;
 use std::path::Path;
-
-use db::{self, ConnectionSource};
+#[cfg(test)]
+use db;
+use db::ConnectionSource;
 use db::{playlists, playlist_songs, songs, users};
 use index::Song;
 use vfs::VFSSource;
@@ -183,7 +184,9 @@ fn read_playlist<T>(playlist_name: &str, owner: &str, db: &T) -> Result<Vec<Song
 		// Find Song objects at the relevant paths
 		{
 			use self::songs::dsl::*;
-			unique_songs = songs.filter(path.eq_any(&song_paths)).get_results(connection.deref())?;
+			unique_songs = songs
+				.filter(path.eq_any(&song_paths))
+				.get_results(connection.deref())?;
 		}
 	}