From 4b4ab8145cda881208077da84294e2aa0dfa12f6 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Tue, 30 Oct 2018 23:49:30 -0700
Subject: [PATCH] Rust 2018

---
 Cargo.toml        |  1 +
 src/config.rs     | 14 +++++++-------
 src/db/mod.rs     |  4 ++--
 src/ddns.rs       |  6 +++---
 src/index.rs      | 14 +++++++-------
 src/lastfm.rs     | 10 +++++-----
 src/main.rs       |  2 +-
 src/metadata.rs   |  6 +++---
 src/playlist.rs   | 14 +++++++-------
 src/rocket_api.rs | 22 +++++++++++-----------
 src/thumbnails.rs |  4 ++--
 src/user.rs       | 18 +++++++++---------
 src/utils.rs      |  2 +-
 src/vfs.rs        |  6 +++---
 14 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5580011..0470933 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 name = "polaris"
 version = "0.9.0"
 authors = ["Antoine Gersant <antoine.gersant@lesforges.org>"]
+edition = "2018"
 
 [features]
 ui = []
diff --git a/src/config.rs b/src/config.rs
index 198dc5f..2e4737a 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -7,13 +7,13 @@ use std::io::Read;
 use std::path;
 use toml;
 
-use db::ConnectionSource;
-use db::DB;
-use db::{ddns_config, misc_settings, mount_points, users};
-use ddns::DDNSConfig;
-use errors::*;
-use user::*;
-use vfs::MountPoint;
+use crate::db::ConnectionSource;
+use crate::db::DB;
+use crate::db::{ddns_config, misc_settings, mount_points, users};
+use crate::ddns::DDNSConfig;
+use crate::errors::*;
+use crate::user::*;
+use crate::vfs::MountPoint;
 
 #[derive(Debug, Queryable)]
 pub struct MiscSettings {
diff --git a/src/db/mod.rs b/src/db/mod.rs
index d875064..5a2a80b 100644
--- a/src/db/mod.rs
+++ b/src/db/mod.rs
@@ -6,7 +6,7 @@ use std::fs;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, MutexGuard};
 
-use errors::*;
+use crate::errors::*;
 
 mod schema;
 
@@ -85,7 +85,7 @@ impl ConnectionSource for DB {
 }
 
 pub fn _get_test_db(name: &str) -> DB {
-	use config;
+	use crate::config;
 	let config_path = Path::new("test/config.toml");
 	let config = config::parse_toml_file(&config_path).unwrap();
 
diff --git a/src/ddns.rs b/src/ddns.rs
index 1ab6d6e..457fb0c 100644
--- a/src/ddns.rs
+++ b/src/ddns.rs
@@ -5,9 +5,9 @@ use std::io;
 use std::thread;
 use std::time;
 
-use db::ddns_config;
-use db::{ConnectionSource, DB};
-use errors;
+use crate::db::ddns_config;
+use crate::db::{ConnectionSource, DB};
+use crate::errors;
 
 #[derive(Clone, Debug, Deserialize, Insertable, PartialEq, Queryable, Serialize)]
 #[table_name = "ddns_config"]
diff --git a/src/index.rs b/src/index.rs
index 4f8bbe5..6a48b5a 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -14,14 +14,14 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use std::time;
 
-use config::MiscSettings;
+use crate::config::MiscSettings;
 #[cfg(test)]
-use db;
-use db::{directories, misc_settings, songs};
-use db::{ConnectionSource, DB};
-use errors;
-use metadata;
-use vfs::{VFSSource, VFS};
+use crate::db;
+use crate::db::{directories, misc_settings, songs};
+use crate::db::{ConnectionSource, DB};
+use crate::errors;
+use crate::metadata;
+use crate::vfs::{VFSSource, VFS};
 
 const INDEX_BUILDING_INSERT_BUFFER_SIZE: usize = 1000; // Insertions in each transaction
 const INDEX_BUILDING_CLEAN_BUFFER_SIZE: usize = 500; // Insertions in each transaction
diff --git a/src/lastfm.rs b/src/lastfm.rs
index c865b4e..20535c4 100644
--- a/src/lastfm.rs
+++ b/src/lastfm.rs
@@ -6,11 +6,11 @@ use std::collections::HashMap;
 use std::io::Read;
 use std::path::Path;
 
-use db::ConnectionSource;
-use errors;
-use index;
-use user;
-use vfs::VFSSource;
+use crate::db::ConnectionSource;
+use crate::errors;
+use crate::index;
+use crate::user;
+use crate::vfs::VFSSource;
 
 const LASTFM_API_KEY: &str = "02b96c939a2b451c31dfd67add1f696e";
 const LASTFM_API_SECRET: &str = "0f25a80ceef4b470b5cb97d99d4b3420";
diff --git a/src/main.rs b/src/main.rs
index 693350e..fb25154 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -54,7 +54,7 @@ use std::io::prelude::*;
 use unix_daemonize::{daemonize_redirect, ChdirMode};
 
 use core::ops::Deref;
-use errors::*;
+use crate::errors::*;
 use getopts::Options;
 use rocket_contrib::serve::StaticFiles;
 use simplelog::{Level, LevelFilter, SimpleLogger, TermLogger};
diff --git a/src/metadata.rs b/src/metadata.rs
index f5db638..b50fac4 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -7,9 +7,9 @@ use regex::Regex;
 use std::fs;
 use std::path::Path;
 
-use errors::*;
-use utils;
-use utils::AudioFormat;
+use crate::errors::*;
+use crate::utils;
+use crate::utils::AudioFormat;
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct SongTags {
diff --git a/src/playlist.rs b/src/playlist.rs
index 1e42889..91bced2 100644
--- a/src/playlist.rs
+++ b/src/playlist.rs
@@ -7,12 +7,12 @@ use diesel::BelongingToDsl;
 use std::path::Path;
 
 #[cfg(test)]
-use db;
-use db::ConnectionSource;
-use db::{playlist_songs, playlists, users};
-use errors::*;
-use index::{self, Song};
-use vfs::VFSSource;
+use crate::db;
+use crate::db::ConnectionSource;
+use crate::db::{playlist_songs, playlists, users};
+use crate::errors::*;
+use crate::index::{self, Song};
+use crate::vfs::VFSSource;
 
 #[derive(Insertable)]
 #[table_name = "playlists"]
@@ -262,7 +262,7 @@ fn test_delete_playlist() {
 
 #[test]
 fn test_fill_playlist() {
-	use index;
+	use crate::index;
 
 	let db = db::_get_test_db("fill_playlist.sqlite");
 	index::update(&db).unwrap();
diff --git a/src/rocket_api.rs b/src/rocket_api.rs
index 32ea386..e1d244c 100644
--- a/src/rocket_api.rs
+++ b/src/rocket_api.rs
@@ -10,17 +10,17 @@ use std::str;
 use std::str::FromStr;
 use std::sync::Arc;
 
-use config::{self, Config, Preferences};
-use db::DB;
-use errors;
-use index;
-use lastfm;
-use playlist;
-use serve;
-use thumbnails;
-use user;
-use utils;
-use vfs::VFSSource;
+use crate::config::{self, Config, Preferences};
+use crate::db::DB;
+use crate::errors;
+use crate::index;
+use crate::lastfm;
+use crate::playlist;
+use crate::serve;
+use crate::thumbnails;
+use crate::user;
+use crate::utils;
+use crate::vfs::VFSSource;
 
 const CURRENT_MAJOR_VERSION: i32 = 3;
 const CURRENT_MINOR_VERSION: i32 = 0;
diff --git a/src/thumbnails.rs b/src/thumbnails.rs
index 23acfda..8f45708 100644
--- a/src/thumbnails.rs
+++ b/src/thumbnails.rs
@@ -11,8 +11,8 @@ use std::fs::{DirBuilder, File};
 use std::hash::{Hash, Hasher};
 use std::path::*;
 
-use errors::*;
-use utils;
+use crate::errors::*;
+use crate::utils;
 
 const THUMBNAILS_PATH: &str = "thumbnails";
 
diff --git a/src/user.rs b/src/user.rs
index fdeaec7..f67cd41 100644
--- a/src/user.rs
+++ b/src/user.rs
@@ -4,9 +4,9 @@ use diesel::prelude::*;
 use rand;
 use ring::{digest, pbkdf2};
 
-use db::users;
-use db::ConnectionSource;
-use errors::*;
+use crate::db::users;
+use crate::db::ConnectionSource;
+use crate::errors::*;
 
 #[derive(Debug, Insertable, Queryable)]
 #[table_name = "users"]
@@ -66,7 +66,7 @@ pub fn auth<T>(db: &T, username: &str, password: &str) -> Result<bool>
 where
 	T: ConnectionSource,
 {
-	use db::users::dsl::*;
+	use crate::db::users::dsl::*;
 	let connection = db.get_connection();
 	match users
 		.select((password_hash, password_salt))
@@ -83,7 +83,7 @@ pub fn count<T>(db: &T) -> Result<i64>
 where
 	T: ConnectionSource,
 {
-	use db::users::dsl::*;
+	use crate::db::users::dsl::*;
 	let connection = db.get_connection();
 	let count = users.count().get_result(connection.deref())?;
 	Ok(count)
@@ -93,7 +93,7 @@ pub fn is_admin<T>(db: &T, username: &str) -> Result<bool>
 where
 	T: ConnectionSource,
 {
-	use db::users::dsl::*;
+	use crate::db::users::dsl::*;
 	let connection = db.get_connection();
 	let is_admin: i32 = users
 		.filter(name.eq(username))
@@ -106,7 +106,7 @@ pub fn lastfm_link<T>(db: &T, username: &str, lastfm_login: &str, session_key: &
 where
 	T: ConnectionSource,
 {
-	use db::users::dsl::*;
+	use crate::db::users::dsl::*;
 	let connection = db.get_connection();
 	diesel::update(users.filter(name.eq(username)))
 		.set((
@@ -121,7 +121,7 @@ pub fn get_lastfm_session_key<T>(db: &T, username: &str) -> Result<String>
 where
 	T: ConnectionSource,
 {
-	use db::users::dsl::*;
+	use crate::db::users::dsl::*;
 	let connection = db.get_connection();
 	let token = users
 		.filter(name.eq(username))
@@ -137,7 +137,7 @@ pub fn lastfm_unlink<T>(db: &T, username: &str) -> Result<()>
 where
 	T: ConnectionSource,
 {
-	use db::users::dsl::*;
+	use crate::db::users::dsl::*;
 	let connection = db.get_connection();
 	diesel::update(users.filter(name.eq(username)))
 		.set((lastfm_session_key.eq(""), lastfm_username.eq("")))
diff --git a/src/utils.rs b/src/utils.rs
index 5ed62fa..f82dc99 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -2,7 +2,7 @@ use app_dirs::{app_root, AppDataType, AppInfo};
 use std::fs;
 use std::path::{Path, PathBuf};
 
-use errors::*;
+use crate::errors::*;
 
 #[cfg(not(target_os = "linux"))]
 const APP_INFO: AppInfo = AppInfo {
diff --git a/src/vfs.rs b/src/vfs.rs
index 9af661a..f55c7c7 100644
--- a/src/vfs.rs
+++ b/src/vfs.rs
@@ -4,9 +4,9 @@ use std::collections::HashMap;
 use std::path::Path;
 use std::path::PathBuf;
 
-use db::mount_points;
-use db::{ConnectionSource, DB};
-use errors::*;
+use crate::db::mount_points;
+use crate::db::{ConnectionSource, DB};
+use crate::errors::*;
 
 pub trait VFSSource {
 	fn get_vfs(&self) -> Result<VFS>;