Fixed import warnings

This commit is contained in:
Antoine Gersant 2017-07-10 22:27:45 -07:00
parent a44c56ee67
commit 0f0fce66ce
2 changed files with 12 additions and 5 deletions

View file

@ -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::*;

View file

@ -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())?;
}
}