Merge pull request diesel-rs#2305 from jplatte/lints

Some small refactorings

Author: weiznich

diesel/src/mysql/connection/url.rs

@@ -40,7 +40,7 @@ impl ConnectionOptions {
             Some(password) => Some(decode_into_cstring(password)?),
             None => None,
         };
-        let database = match url.path_segments().and_then(|mut iter| iter.nth(0)) {
+        let database = match url.path_segments().and_then(|mut iter| iter.next()) {
             Some("") | None => None,
             Some(segment) => Some(CString::new(segment.as_bytes())?),
         };

diesel_cli/src/config.rs

@@ -4,7 +4,6 @@ use std::error::Error;
 use std::fs;
 use std::io::Read;
 use std::path::PathBuf;
-use toml;
 
 use super::find_project_root;
 use crate::print_schema;

diesel_cli/src/infer_schema_internals/sqlite.rs

@@ -85,7 +85,7 @@ pub fn load_foreign_key_constraints(
                 .collect())
         })
         .collect::<QueryResult<Vec<Vec<_>>>>()?;
-    Ok(rows.into_iter().flat_map(|x| x).collect())
+    Ok(rows.into_iter().flatten().collect())
 }
 
 pub fn get_table_data(

diesel_cli/src/main.rs

@@ -216,8 +216,7 @@ fn migrations_dir(matches: &ArgMatches) -> Result<PathBuf, MigrationError> {
                 Config::read(matches)
                     .unwrap_or_else(handle_error)
                     .migrations_directory?
-                    .dir
-                    .to_owned(),
+                    .dir,
             )
         });
 
@@ -248,7 +247,7 @@ fn create_migrations_dir(matches: &ArgMatches) -> DatabaseResult<PathBuf> {
         create_migrations_directory(&dir)?;
     }
 
-    Ok(dir.to_owned())
+    Ok(dir)
 }
 
 fn create_config_file(matches: &ArgMatches) -> DatabaseResult<()> {

diesel_derives/src/meta.rs

@@ -82,7 +82,7 @@ impl MetaItem {
     }
 
     pub fn ident_value(&self) -> Result<syn::Ident, Diagnostic> {
-        let maybe_attr = self.nested().ok().and_then(|mut n| n.nth(0));
+        let maybe_attr = self.nested().ok().and_then(|mut n| n.next());
         let maybe_path = maybe_attr.as_ref().and_then(|m| m.path().ok());
         match maybe_path {
             Some(x) => {

diesel_derives/src/util.rs

@@ -8,6 +8,12 @@ pub fn wrap_in_dummy_mod(item: TokenStream) -> TokenStream {
     quote! {
         #[allow(unused_imports)]
         const _: () = {
+            // This import is not actually redundant. When using diesel_derives
+            // inside of diesel, `diesel` doesn't exist as an extern crate, and
+            // to work around that it contains a private
+            // `mod diesel { pub use super::*; }` that this import will then
+            // refer to. In all other cases, this imports refers to the extern
+            // crate diesel.
             use diesel;
 
             #item
@@ -46,7 +52,7 @@ fn option_ty_arg(ty: &Type) -> Option<&Type> {
 pub fn ty_for_foreign_derive(item: &DeriveInput, flags: &MetaItem) -> Result<Type, Diagnostic> {
     if flags.has_flag("foreign_derive") {
         match item.data {
-            Data::Struct(ref body) => match body.fields.iter().nth(0) {
+            Data::Struct(ref body) => match body.fields.iter().next() {
                 Some(field) => Ok(field.ty.clone()),
                 None => Err(flags
                     .span()

diesel_migrations/migrations_internals/src/migration.rs

@@ -102,7 +102,7 @@ pub fn version_from_path(path: &Path) -> Result<String, MigrationError> {
         .unwrap_or_else(|| panic!("Can't get file name from path `{:?}`", path))
         .to_string_lossy()
         .split('_')
-        .nth(0)
+        .next()
         .map(|s| Ok(s.replace('-', "")))
         .unwrap_or_else(|| Err(MigrationError::UnknownMigrationFormat(path.to_path_buf())))
 }