Merge pull request diesel-rs#2306 from jplatte/cli_2018

Update diesel_cli to Rust 2018

Author: weiznich

diesel/src/migration/errors.rs

@@ -36,10 +36,11 @@ impl fmt::Display for MigrationError {
                 f,
                 "Unable to find migrations directory in this directory or any parent directories."
             ),
-            MigrationError::UnknownMigrationFormat(_) => {
-                write!(f,"Invalid migration directory, the directory's name should be \
-                 <timestamp>_<name_of_migration>, and it should only contain up.sql and down.sql.")
-            }
+            MigrationError::UnknownMigrationFormat(_) => write!(
+                f,
+                "Invalid migration directory, the directory's name should be \
+                 <timestamp>_<name_of_migration>, and it should only contain up.sql and down.sql."
+            ),
             MigrationError::IoError(ref error) => write!(f, "{}", error),
             MigrationError::UnknownMigrationVersion(_) => write!(
                 f,

diesel_cli/Cargo.toml

@@ -10,6 +10,7 @@ homepage = "https://diesel.rs"
 repository = "https://github.com/diesel-rs/diesel"
 keywords = ["diesel", "migrations", "cli"]
 autotests = false
+edition = "2018"
 
 [[bin]]
 name = "diesel"

diesel_cli/src/config.rs

@@ -7,7 +7,7 @@ use std::path::PathBuf;
 use toml;
 
 use super::find_project_root;
-use print_schema;
+use crate::print_schema;
 
 #[derive(Deserialize, Default)]
 #[serde(deny_unknown_fields)]

diesel_cli/src/database.rs

@@ -6,7 +6,7 @@ use diesel::sql_types::Bool;
 use diesel::*;
 use migrations_internals as migrations;
 
-use database_error::{DatabaseError, DatabaseResult};
+use crate::database_error::{DatabaseError, DatabaseResult};
 
 use std::env;
 use std::error::Error;
@@ -134,13 +134,15 @@ macro_rules! call_with_conn {
         $database_url:expr,
         $($func:ident)::+ ($($args:expr),*)
     ) => {
-        match ::database::InferConnection::establish(&$database_url).unwrap_or_else(handle_error) {
+        match crate::database::InferConnection::establish(&$database_url)
+            .unwrap_or_else(handle_error)
+        {
             #[cfg(feature="postgres")]
-            ::database::InferConnection::Pg(ref conn) => $($func)::+ (conn, $($args),*),
+            crate::database::InferConnection::Pg(ref conn) => $($func)::+ (conn, $($args),*),
             #[cfg(feature="sqlite")]
-            ::database::InferConnection::Sqlite(ref conn) => $($func)::+ (conn, $($args),*),
+            crate::database::InferConnection::Sqlite(ref conn) => $($func)::+ (conn, $($args),*),
             #[cfg(feature="mysql")]
-            ::database::InferConnection::Mysql(ref conn) => $($func)::+ (conn, $($args),*),
+            crate::database::InferConnection::Mysql(ref conn) => $($func)::+ (conn, $($args),*),
         }
     };
 }

diesel_cli/src/infer_schema_internals/foreign_keys.rs

@@ -3,7 +3,7 @@
 use super::data_structures::ForeignKeyConstraint;
 use super::inference::get_primary_keys;
 use super::table_data::TableName;
-use database::InferConnection;
+use crate::database::InferConnection;
 
 pub fn remove_unsafe_foreign_keys_for_codegen(
     database_url: &str,

diesel_cli/src/infer_schema_internals/inference.rs

@@ -4,7 +4,7 @@ use diesel::result::Error::NotFound;
 
 use super::data_structures::*;
 use super::table_data::*;
-use database::InferConnection;
+use crate::database::InferConnection;
 
 static RESERVED_NAMES: &[&str] = &[
     "abstract", "alignof", "as", "become", "box", "break", "const", "continue", "crate", "do",

diesel_cli/src/main.rs

@@ -55,7 +55,7 @@ use std::{env, fs};
 
 use self::config::Config;
 use self::database_error::{DatabaseError, DatabaseResult};
-use migrations::MigrationError;
+use crate::migrations::MigrationError;
 use migrations_internals::TIMESTAMP_FORMAT;
 
 fn main() {
@@ -376,8 +376,8 @@ fn convert_absolute_path_to_relative(target_path: &Path, mut current_path: &Path
 }
 
 fn run_infer_schema(matches: &ArgMatches) -> Result<(), Box<dyn Error>> {
-    use infer_schema_internals::TableName;
-    use print_schema::*;
+    use crate::infer_schema_internals::TableName;
+    use crate::print_schema::*;
 
     let database_url = database::database_url(matches);
     let mut config = Config::read(matches)?.print_schema;
@@ -468,7 +468,7 @@ fn regenerate_schema_if_file_specified(matches: &ArgMatches) -> Result<(), Box<d
 mod tests {
     extern crate tempfile;
 
-    use database_error::DatabaseError;
+    use crate::database_error::DatabaseError;
 
     use self::tempfile::Builder;
 

diesel_cli/src/print_schema.rs

@@ -1,6 +1,6 @@
-use config;
+use crate::config;
 
-use infer_schema_internals::*;
+use crate::infer_schema_internals::*;
 use serde::de::{self, MapAccess, Visitor};
 use serde::{Deserialize, Deserializer};
 use std::error::Error;

diesel_cli/tests/completion_generation.rs

@@ -1,4 +1,4 @@
-use support::project;
+use crate::support::project;
 
 #[test]
 fn can_generate_deprecated_bash_completion() {

diesel_cli/tests/database_drop.rs

@@ -1,4 +1,4 @@
-use support::{database, project};
+use crate::support::{database, project};
 
 #[test]
 fn database_drop_drops_database() {