Add missing dyn Trait in diesel_cli

Author: weiznich

diesel_cli/src/config.rs

@@ -25,7 +25,7 @@ impl Config {
             .unwrap_or_else(|| find_project_root().unwrap_or_default().join("diesel.toml"))
     }
 
-    pub fn read(matches: &ArgMatches) -> Result<Self, Box<Error>> {
+    pub fn read(matches: &ArgMatches) -> Result<Self, Box<dyn Error>> {
         let path = Self::file_path(matches);
 
         if path.exists() {

diesel_cli/src/infer_schema_internals/inference.rs

@@ -17,7 +17,7 @@ static RESERVED_NAMES: &[&str] = &[
 pub fn load_table_names(
     database_url: &str,
     schema_name: Option<&str>,
-) -> Result<Vec<TableName>, Box<Error>> {
+) -> Result<Vec<TableName>, Box<dyn Error>> {
     let connection = InferConnection::establish(database_url)?;
 
     match connection {
@@ -33,7 +33,7 @@ pub fn load_table_names(
 fn get_column_information(
     conn: &InferConnection,
     table: &TableName,
-) -> Result<Vec<ColumnInformation>, Box<Error>> {
+) -> Result<Vec<ColumnInformation>, Box<dyn Error>> {
     let column_info = match *conn {
         #[cfg(feature = "sqlite")]
         InferConnection::Sqlite(ref c) => super::sqlite::get_table_data(c, table),
@@ -52,7 +52,7 @@ fn get_column_information(
 fn determine_column_type(
     attr: &ColumnInformation,
     conn: &InferConnection,
-) -> Result<ColumnType, Box<Error>> {
+) -> Result<ColumnType, Box<dyn Error>> {
     match *conn {
         #[cfg(feature = "sqlite")]
         InferConnection::Sqlite(_) => super::sqlite::determine_column_type(attr),
@@ -66,7 +66,7 @@ fn determine_column_type(
 pub(crate) fn get_primary_keys(
     conn: &InferConnection,
     table: &TableName,
-) -> Result<Vec<String>, Box<Error>> {
+) -> Result<Vec<String>, Box<dyn Error>> {
     let primary_keys: Vec<String> = match *conn {
         #[cfg(feature = "sqlite")]
         InferConnection::Sqlite(ref c) => super::sqlite::get_primary_keys(c, table),
@@ -90,7 +90,7 @@ pub(crate) fn get_primary_keys(
 pub fn load_foreign_key_constraints(
     database_url: &str,
     schema_name: Option<&str>,
-) -> Result<Vec<ForeignKeyConstraint>, Box<Error>> {
+) -> Result<Vec<ForeignKeyConstraint>, Box<dyn Error>> {
     let connection = InferConnection::establish(database_url)?;
 
     let constraints = match connection {
@@ -129,7 +129,7 @@ macro_rules! doc_comment {
     };
 }
 
-pub fn load_table_data(database_url: &str, name: TableName) -> Result<TableData, Box<Error>> {
+pub fn load_table_data(database_url: &str, name: TableName) -> Result<TableData, Box<dyn Error>> {
     let connection = InferConnection::establish(database_url)?;
     let docs = doc_comment!(
         "Representation of the `{}` table.
@@ -175,7 +175,7 @@ pub fn load_table_data(database_url: &str, name: TableName) -> Result<TableData,
                 rust_name,
             })
         })
-        .collect::<Result<_, Box<Error>>>()?;
+        .collect::<Result<_, Box<dyn Error>>>()?;
 
     Ok(TableData {
         name,

diesel_cli/src/infer_schema_internals/information_schema.rs

@@ -167,7 +167,7 @@ where
 pub fn load_table_names<Conn>(
     connection: &Conn,
     schema_name: Option<&str>,
-) -> Result<Vec<TableName>, Box<Error>>
+) -> Result<Vec<TableName>, Box<dyn Error>>
 where
     Conn: Connection,
     Conn::Backend: UsesInformationSchema,

diesel_cli/src/infer_schema_internals/mysql.rs

@@ -82,7 +82,7 @@ pub fn load_foreign_key_constraints(
     Ok(constraints)
 }
 
-pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box<Error>> {
+pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box<dyn Error>> {
     let tpe = determine_type_name(&attr.type_name)?;
     let unsigned = determine_unsigned(&attr.type_name);
 
@@ -94,7 +94,7 @@ pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box
     })
 }
 
-fn determine_type_name(sql_type_name: &str) -> Result<String, Box<Error>> {
+fn determine_type_name(sql_type_name: &str) -> Result<String, Box<dyn Error>> {
     let result = if sql_type_name == "tinyint(1)" {
         "bool"
     } else if sql_type_name.starts_with("int") {

diesel_cli/src/infer_schema_internals/pg.rs

@@ -3,7 +3,7 @@ use heck::CamelCase;
 use std::error::Error;
 use std::io::{stderr, Write};
 
-pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box<Error>> {
+pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box<dyn Error>> {
     let is_array = attr.type_name.starts_with('_');
     let tpe = if is_array {
         &attr.type_name[1..]

diesel_cli/src/infer_schema_internals/sqlite.rs

@@ -39,7 +39,7 @@ table! {
 pub fn load_table_names(
     connection: &SqliteConnection,
     schema_name: Option<&str>,
-) -> Result<Vec<TableName>, Box<Error>> {
+) -> Result<Vec<TableName>, Box<dyn Error>> {
     use self::sqlite_master::dsl::*;
 
     if schema_name.is_some() {
@@ -63,7 +63,7 @@ pub fn load_table_names(
 pub fn load_foreign_key_constraints(
     connection: &SqliteConnection,
     schema_name: Option<&str>,
-) -> Result<Vec<ForeignKeyConstraint>, Box<Error>> {
+) -> Result<Vec<ForeignKeyConstraint>, Box<dyn Error>> {
     let tables = load_table_names(connection, schema_name)?;
     let rows = tables
         .into_iter()
@@ -127,7 +127,7 @@ pub fn get_primary_keys(conn: &SqliteConnection, table: &TableName) -> QueryResu
         .collect())
 }
 
-pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box<Error>> {
+pub fn determine_column_type(attr: &ColumnInformation) -> Result<ColumnType, Box<dyn Error>> {
     let type_name = attr.type_name.to_lowercase();
     let path = if is_bool(&type_name) {
         String::from("Bool")

diesel_cli/src/main.rs

@@ -48,6 +48,7 @@ use clap::{ArgMatches, Shell};
 use migrations_internals::{self as migrations, MigrationConnection};
 use std::any::Any;
 use std::error::Error;
+use std::fmt::Display;
 use std::io::stdout;
 use std::path::{Path, PathBuf};
 use std::{env, fs};
@@ -75,7 +76,7 @@ fn main() {
 
 // https://github.com/rust-lang-nursery/rust-clippy/issues/2927#issuecomment-405705595
 #[allow(clippy::similar_names)]
-fn run_migration_command(matches: &ArgMatches) -> Result<(), Box<Error>> {
+fn run_migration_command(matches: &ArgMatches) -> Result<(), Box<dyn Error>> {
     match matches.subcommand() {
         ("run", Some(_)) => {
             let database_url = database::database_url(matches);
@@ -171,11 +172,10 @@ fn generate_sql_migration(path: &PathBuf) {
         .unwrap();
 }
 
-use std::fmt::Display;
-fn migration_version<'a>(matches: &'a ArgMatches) -> Box<Display + 'a> {
+fn migration_version<'a>(matches: &'a ArgMatches) -> Box<dyn Display + 'a> {
     matches
         .value_of("MIGRATION_VERSION")
-        .map(|s| Box::new(s) as Box<Display>)
+        .map(|s| Box::new(s) as Box<dyn Display>)
         .unwrap_or_else(|| Box::new(Utc::now().format(TIMESTAMP_FORMAT)))
 }
 
@@ -233,7 +233,7 @@ fn create_config_file(matches: &ArgMatches) -> DatabaseResult<()> {
     Ok(())
 }
 
-fn run_database_command(matches: &ArgMatches) -> Result<(), Box<Error>> {
+fn run_database_command(matches: &ArgMatches) -> Result<(), Box<dyn Error>> {
     match matches.subcommand() {
         ("setup", Some(args)) => {
             let migrations_dir = migrations_dir(args);
@@ -315,12 +315,12 @@ where
 }
 
 #[cfg(feature = "mysql")]
-fn should_redo_migration_in_transaction(t: &Any) -> bool {
+fn should_redo_migration_in_transaction(t: &dyn Any) -> bool {
     !t.is::<::diesel::mysql::MysqlConnection>()
 }
 
 #[cfg(not(feature = "mysql"))]
-fn should_redo_migration_in_transaction(_t: &Any) -> bool {
+fn should_redo_migration_in_transaction(_t: &dyn Any) -> bool {
     true
 }
 
@@ -346,7 +346,7 @@ fn convert_absolute_path_to_relative(target_path: &Path, mut current_path: &Path
     result.join(target_path.strip_prefix(current_path).unwrap())
 }
 
-fn run_infer_schema(matches: &ArgMatches) -> Result<(), Box<Error>> {
+fn run_infer_schema(matches: &ArgMatches) -> Result<(), Box<dyn Error>> {
     use infer_schema_internals::TableName;
     use print_schema::*;
 
@@ -400,7 +400,7 @@ fn run_infer_schema(matches: &ArgMatches) -> Result<(), Box<Error>> {
     Ok(())
 }
 
-fn regenerate_schema_if_file_specified(matches: &ArgMatches) -> Result<(), Box<Error>> {
+fn regenerate_schema_if_file_specified(matches: &ArgMatches) -> Result<(), Box<dyn Error>> {
     use std::io::Read;
 
     let config = Config::read(matches)?;

diesel_cli/src/print_schema.rs

@@ -39,7 +39,7 @@ pub fn run_print_schema<W: IoWrite>(
     database_url: &str,
     config: &config::PrintSchema,
     output: &mut W,
-) -> Result<(), Box<Error>> {
+) -> Result<(), Box<dyn Error>> {
     let tempfile = NamedTempFile::new()?;
     let file = tempfile.reopen()?;
     output_schema(database_url, config, file, tempfile.path())?;
@@ -56,7 +56,7 @@ pub fn output_schema(
     config: &config::PrintSchema,
     mut out: File,
     out_path: &Path,
-) -> Result<(), Box<Error>> {
+) -> Result<(), Box<dyn Error>> {
     let table_names = load_table_names(database_url, config.schema_name())?
         .into_iter()
         .filter(|t| !config.filter.should_ignore_table(t))
@@ -67,7 +67,7 @@ pub fn output_schema(
     let table_data = table_names
         .into_iter()
         .map(|t| load_table_data(database_url, t))
-        .collect::<Result<_, Box<Error>>>()?;
+        .collect::<Result<_, Box<dyn Error>>>()?;
     let definitions = TableDefinitions {
         tables: table_data,
         fk_constraints: foreign_keys,