Merge pull request #3948 from weiznich/fix/nightly_warnings

Fix a new nightly lint

diesel/src/associations/belongs_to.rs

@@ -1,4 +1,4 @@
-use super::{HasTable, Identifiable};
+use super::HasTable;
 use crate::dsl::{Eq, EqAny, Filter, FindBy};
 use crate::expression::array_comparison::AsInExpression;
 use crate::expression::AsExpression;

diesel/src/expression/assume_not_null.rs

@@ -1,5 +1,3 @@
-use crate::backend::Backend;
-use crate::expression::TypedExpressionType;
 use crate::expression::*;
 use crate::query_builder::*;
 use crate::query_source::joins::ToInnerJoin;

diesel/src/expression/bound.rs

@@ -1,11 +1,10 @@
 use std::marker::PhantomData;
 
 use super::*;
-use crate::backend::Backend;
 use crate::query_builder::*;
 use crate::result::QueryResult;
 use crate::serialize::ToSql;
-use crate::sql_types::{DieselNumericOps, HasSqlType, SqlType};
+use crate::sql_types::DieselNumericOps;
 
 #[doc(hidden)] // This is used by the `AsExpression` derive
 #[derive(Debug, Clone, Copy, DieselNumericOps)]

diesel/src/expression/coerce.rs

@@ -1,10 +1,8 @@
-use std::marker::PhantomData;
-
-use crate::backend::Backend;
 use crate::expression::*;
 use crate::query_builder::*;
 use crate::result::QueryResult;
-use crate::sql_types::{DieselNumericOps, SqlType};
+use crate::sql_types::DieselNumericOps;
+use std::marker::PhantomData;
 
 #[derive(Debug, Copy, Clone, QueryId, DieselNumericOps)]
 #[doc(hidden)]

diesel/src/expression/nullable.rs

@@ -1,5 +1,4 @@
-use crate::backend::{Backend, DieselReserveSpecialization};
-use crate::expression::TypedExpressionType;
+use crate::backend::DieselReserveSpecialization;
 use crate::expression::*;
 use crate::query_builder::*;
 use crate::query_source::joins::ToInnerJoin;

diesel/src/expression/sql_literal.rs

@@ -1,11 +1,10 @@
 use std::marker::PhantomData;
 
-use crate::backend::Backend;
 use crate::expression::*;
 use crate::query_builder::*;
 use crate::query_dsl::RunQueryDsl;
 use crate::result::QueryResult;
-use crate::sql_types::{DieselNumericOps, SqlType};
+use crate::sql_types::DieselNumericOps;
 
 #[derive(Debug, Clone, DieselNumericOps)]
 #[must_use = "Queries are only executed when calling `load`, `get_result`, or similar."]

diesel/src/expression/subselect.rs

@@ -4,7 +4,6 @@ use crate::expression::array_comparison::MaybeEmpty;
 use crate::expression::*;
 use crate::query_builder::*;
 use crate::result::QueryResult;
-use crate::sql_types::SqlType;
 
 #[derive(Debug, Copy, Clone, QueryId)]
 pub struct Subselect<T, ST> {

diesel/src/mysql/connection/bind.rs

@@ -734,7 +734,6 @@ fn known_buffer_size_for_ffi_type(tpe: ffi::enum_field_types) -> Option<usize> {
 
 #[cfg(test)]
 mod tests {
-    use super::MysqlValue;
     use super::*;
     use crate::connection::statement_cache::MaybeCached;
     use crate::deserialize::FromSql;

diesel/src/mysql/connection/mod.rs

@@ -9,7 +9,6 @@ use self::stmt::Statement;
 use self::url::ConnectionOptions;
 use super::backend::Mysql;
 use crate::connection::instrumentation::DebugQuery;
-use crate::connection::instrumentation::InstrumentationEvent;
 use crate::connection::instrumentation::StrQueryHelper;
 use crate::connection::statement_cache::{MaybeCached, StatementCache};
 use crate::connection::*;

diesel/src/mysql/connection/stmt/mod.rs

@@ -1,6 +1,5 @@
 #![allow(unsafe_code)] // module uses ffi
 use mysqlclient_sys as ffi;
-use std::convert::TryFrom;
 use std::ffi::CStr;
 use std::os::raw as libc;
 use std::ptr::NonNull;

diesel/src/mysql/types/date_and_time/time.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::os::raw as libc;
 use time::{
     Date as NaiveDate, Month, OffsetDateTime, PrimitiveDateTime, Time as NaiveTime, UtcOffset,

diesel/src/mysql/types/primitives.rs

@@ -3,7 +3,6 @@ use crate::mysql::{Mysql, MysqlValue, NumericRepresentation};
 use crate::result::Error::DeserializationError;
 use crate::sql_types::{BigInt, Binary, Double, Float, Integer, SmallInt, Text};
 use crate::Queryable;
-use std::convert::TryInto;
 use std::error::Error;
 use std::str::{self, FromStr};
 

diesel/src/pg/connection/mod.rs

@@ -10,8 +10,8 @@ use self::raw::{PgTransactionStatus, RawConnection};
 use self::result::PgResult;
 use self::stmt::Statement;
 use crate::connection::instrumentation::DebugQuery;
+use crate::connection::instrumentation::Instrumentation;
 use crate::connection::instrumentation::StrQueryHelper;
-use crate::connection::instrumentation::{Instrumentation, InstrumentationEvent};
 use crate::connection::statement_cache::{MaybeCached, StatementCache};
 use crate::connection::*;
 use crate::expression::QueryMetadata;

diesel/src/pg/expression/extensions/interval_dsl.rs

@@ -252,7 +252,6 @@ mod tests {
     use self::quickcheck::quickcheck;
 
     use super::*;
-    use crate::data_types::PgInterval;
     use crate::dsl::sql;
     use crate::prelude::*;
     use crate::test_helpers::*;

diesel/src/pg/types/mac_addr.rs

@@ -1,4 +1,3 @@
-use std::convert::TryInto;
 use std::io::prelude::*;
 
 use crate::deserialize::{self, FromSql};

diesel/src/pg/types/mod.rs

@@ -566,7 +566,7 @@ pub mod sql_types {
 mod ops {
     use super::sql_types::*;
     use crate::sql_types::ops::*;
-    use crate::sql_types::{Bigint, Cidr, Inet, Interval};
+    use crate::sql_types::{Bigint, Interval};
 
     impl Add for Timestamptz {
         type Rhs = Interval;

diesel/src/pg/types/numeric.rs

@@ -16,7 +16,6 @@ mod bigdecimal {
     use crate::serialize::{self, Output, ToSql};
     use crate::sql_types::Numeric;
 
-    use std::convert::{TryFrom, TryInto};
     use std::error::Error;
 
     /// Iterator over the digits of a big uint in base 10k.

diesel/src/query_builder/combination_clause.rs

@@ -238,8 +238,6 @@ pub struct ParenthesisWrapper<T>(T);
 mod postgres {
     use super::*;
     use crate::pg::Pg;
-    use crate::query_builder::{AstPass, QueryFragment};
-    use crate::QueryResult;
 
     impl<T: QueryFragment<Pg>> QueryFragment<Pg> for ParenthesisWrapper<T> {
         fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Pg>) -> QueryResult<()> {
@@ -262,8 +260,6 @@ mod postgres {
 mod mysql {
     use super::*;
     use crate::mysql::Mysql;
-    use crate::query_builder::{AstPass, QueryFragment};
-    use crate::QueryResult;
 
     impl<T: QueryFragment<Mysql>> QueryFragment<Mysql> for ParenthesisWrapper<T> {
         fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Mysql>) -> QueryResult<()> {
@@ -281,9 +277,7 @@ mod mysql {
 #[cfg(feature = "sqlite")]
 mod sqlite {
     use super::*;
-    use crate::query_builder::{AstPass, QueryFragment};
     use crate::sqlite::Sqlite;
-    use crate::QueryResult;
 
     impl<T: QueryFragment<Sqlite>> QueryFragment<Sqlite> for ParenthesisWrapper<T> {
         fn walk_ast<'b>(&'b self, mut out: AstPass<'_, 'b, Sqlite>) -> QueryResult<()> {

diesel/src/query_builder/delete_statement/mod.rs

@@ -1,4 +1,4 @@
-use crate::backend::{Backend, DieselReserveSpecialization};
+use crate::backend::DieselReserveSpecialization;
 use crate::dsl::{Filter, IntoBoxed, OrFilter};
 use crate::expression::{AppearsOnTable, SelectableExpression};
 use crate::query_builder::returning_clause::*;
@@ -7,9 +7,6 @@ use crate::query_builder::*;
 use crate::query_dsl::methods::{BoxedDsl, FilterDsl, OrFilterDsl};
 use crate::query_dsl::RunQueryDsl;
 use crate::query_source::{QuerySource, Table};
-use crate::result::QueryResult;
-
-use super::from_clause::FromClause;
 
 #[must_use = "Queries are only executed when calling `load`, `get_result` or similar."]
 /// Represents a SQL `DELETE` statement.

diesel/src/query_builder/distinct_clause.rs

@@ -1,7 +1,6 @@
-use crate::backend::{Backend, DieselReserveSpecialization};
+use crate::backend::DieselReserveSpecialization;
 use crate::query_builder::*;
 use crate::query_dsl::order_dsl::ValidOrderingForDistinct;
-use crate::result::QueryResult;
 
 #[derive(Debug, Clone, Copy, QueryId)]
 pub struct NoDistinctClause;

diesel/src/query_builder/insert_statement/column_list.rs

@@ -1,7 +1,5 @@
-use crate::backend::Backend;
 use crate::query_builder::*;
 use crate::query_source::Column;
-use crate::result::QueryResult;
 
 /// Represents the column list for use in an insert statement.
 ///

diesel/src/query_builder/insert_statement/insert_from_select.rs

@@ -1,4 +1,3 @@
-use crate::backend::Backend;
 use crate::expression::{Expression, NonAggregate, SelectableExpression};
 use crate::insertable::*;
 use crate::query_builder::*;

diesel/src/query_builder/insert_statement/insert_with_default_for_sqlite.rs

@@ -1,13 +1,11 @@
 use super::{BatchInsert, InsertStatement};
-use crate::connection::Connection;
 use crate::insertable::InsertValues;
 use crate::insertable::{CanInsertInSingleQuery, ColumnInsertValue, DefaultableColumnInsertValue};
 use crate::prelude::*;
 use crate::query_builder::{AstPass, QueryId, ValuesClause};
 use crate::query_builder::{DebugQuery, QueryFragment};
 use crate::query_dsl::methods::ExecuteDsl;
 use crate::sqlite::Sqlite;
-use crate::{QueryResult, Table};
 use std::fmt::{self, Debug, Display};
 
 pub trait DebugQueryHelper<ContainsDefaultableValue> {

diesel/src/query_builder/insert_statement/mod.rs

@@ -8,14 +8,13 @@ pub(crate) use self::insert_from_select::InsertFromSelect;
 pub(crate) use self::private::{Insert, InsertOrIgnore, Replace};
 
 use super::returning_clause::*;
-use crate::backend::{sql_dialect, Backend, DieselReserveSpecialization, SqlDialect};
+use crate::backend::{sql_dialect, DieselReserveSpecialization, SqlDialect};
 use crate::expression::grouped::Grouped;
 use crate::expression::operators::Eq;
 use crate::expression::{Expression, NonAggregate, SelectableExpression};
 use crate::query_builder::*;
 use crate::query_dsl::RunQueryDsl;
 use crate::query_source::{Column, Table};
-use crate::result::QueryResult;
 use crate::{insertable::*, QuerySource};
 use std::marker::PhantomData;
 

diesel/src/query_builder/nodes/mod.rs

@@ -1,6 +1,5 @@
-use crate::backend::{Backend, DieselReserveSpecialization};
+use crate::backend::DieselReserveSpecialization;
 use crate::query_builder::*;
-use crate::result::QueryResult;
 use std::marker::PhantomData;
 
 #[doc(hidden)] // used by the table macro

diesel/src/query_builder/select_clause.rs

@@ -1,5 +1,4 @@
 use super::from_clause::AsQuerySource;
-use crate::backend::Backend;
 use crate::expression::{Expression, SelectableExpression};
 use crate::query_builder::*;
 use crate::query_source::QuerySource;

diesel/src/query_builder/select_statement/boxed.rs

@@ -1,13 +1,12 @@
 use std::marker::PhantomData;
 
-use crate::backend::{sql_dialect, Backend, DieselReserveSpecialization};
+use crate::backend::{sql_dialect, DieselReserveSpecialization};
 use crate::dsl::AsExprOf;
 use crate::expression::subselect::ValidSubselect;
 use crate::expression::*;
 use crate::insertable::Insertable;
 use crate::query_builder::combination_clause::*;
 use crate::query_builder::distinct_clause::DistinctClause;
-use crate::query_builder::from_clause::FromClause;
 use crate::query_builder::group_by_clause::ValidGroupByClause;
 use crate::query_builder::having_clause::HavingClause;
 use crate::query_builder::insert_statement::InsertFromSelect;
@@ -21,7 +20,6 @@ use crate::query_dsl::methods::*;
 use crate::query_dsl::*;
 use crate::query_source::joins::*;
 use crate::query_source::{QuerySource, Table};
-use crate::result::QueryResult;
 use crate::sql_types::{BigInt, BoolOrNullableBool, IntoNullable};
 
 // This is used by the table macro internally

diesel/src/query_builder/select_statement/dsl_impls.rs

@@ -23,7 +23,6 @@ use crate::query_builder::NoFromClause;
 use crate::query_builder::{
     AsQuery, IntoBoxedClause, Query, QueryFragment, SelectQuery, SelectStatement,
 };
-use crate::query_dsl::boxed_dsl::BoxedDsl;
 use crate::query_dsl::methods::*;
 use crate::query_dsl::order_dsl::ValidOrderingForDistinct;
 use crate::query_dsl::*;

diesel/src/query_builder/update_statement/changeset.rs

@@ -1,10 +1,9 @@
-use crate::backend::{Backend, DieselReserveSpecialization};
+use crate::backend::DieselReserveSpecialization;
 use crate::expression::grouped::Grouped;
 use crate::expression::operators::Eq;
 use crate::expression::AppearsOnTable;
 use crate::query_builder::*;
 use crate::query_source::{Column, QuerySource};
-use crate::result::QueryResult;
 use crate::Table;
 
 /// Types which can be passed to

diesel/src/query_builder/update_statement/mod.rs

@@ -1,9 +1,7 @@
 pub(crate) mod changeset;
 pub(super) mod target;
 
-use self::target::UpdateTarget;
-
-use crate::backend::{Backend, DieselReserveSpecialization};
+use crate::backend::DieselReserveSpecialization;
 use crate::dsl::{Filter, IntoBoxed};
 use crate::expression::{
     is_aggregate, AppearsOnTable, Expression, MixedAggregates, SelectableExpression, ValidGrouping,
@@ -14,7 +12,6 @@ use crate::query_dsl::methods::{BoxedDsl, FilterDsl};
 use crate::query_dsl::RunQueryDsl;
 use crate::query_source::Table;
 use crate::result::Error::QueryBuilderError;
-use crate::result::QueryResult;
 use crate::{query_builder::*, QuerySource};
 
 impl<T: QuerySource, U> UpdateStatement<T, U, SetNotCalled> {

diesel/src/query_builder/upsert/on_conflict_actions.rs

@@ -1,11 +1,9 @@
 use std::marker::PhantomData;
 
 use crate::backend::sql_dialect::on_conflict_clause;
-use crate::backend::Backend;
 use crate::expression::{AppearsOnTable, Expression};
 use crate::query_builder::*;
 use crate::query_source::*;
-use crate::result::QueryResult;
 
 #[doc(hidden)]
 #[derive(Debug, Clone, Copy, QueryId)]

diesel/src/query_builder/upsert/on_conflict_clause.rs

@@ -1,11 +1,9 @@
 use super::on_conflict_actions::*;
 use super::on_conflict_target::*;
 use crate::backend::sql_dialect;
-use crate::backend::Backend;
 use crate::insertable::*;
 use crate::query_builder::where_clause::{NoWhereClause, WhereClause};
 use crate::query_builder::*;
-use crate::result::QueryResult;
 
 #[doc(hidden)]
 #[derive(Debug, Clone, Copy)]

diesel/src/query_builder/upsert/on_conflict_target.rs

@@ -1,8 +1,7 @@
-use crate::backend::{sql_dialect, Backend};
+use crate::backend::sql_dialect;
 use crate::expression::SqlLiteral;
 use crate::query_builder::*;
 use crate::query_source::Column;
-use crate::result::QueryResult;
 
 #[doc(hidden)]
 pub trait OnConflictTarget<Table> {}

diesel/src/query_builder/where_clause.rs

@@ -1,10 +1,9 @@
 use super::from_clause::AsQuerySource;
 use super::*;
-use crate::backend::{Backend, DieselReserveSpecialization};
+use crate::backend::DieselReserveSpecialization;
 use crate::expression::grouped::Grouped;
 use crate::expression::operators::{And, Or};
 use crate::expression::*;
-use crate::result::QueryResult;
 use crate::sql_types::BoolOrNullableBool;
 
 /// Add `Predicate` to the current `WHERE` clause, joining with `AND` if

diesel/src/query_source/joins.rs

@@ -1,13 +1,11 @@
-use super::{AppearsInFromClause, Plus, QuerySource};
+use super::{AppearsInFromClause, Plus};
 use crate::backend::Backend;
 use crate::backend::DieselReserveSpecialization;
 use crate::expression::grouped::Grouped;
 use crate::expression::nullable::Nullable;
-use crate::expression::SelectableExpression;
 use crate::prelude::*;
 use crate::query_builder::*;
 use crate::query_dsl::InternalJoinDsl;
-use crate::result::QueryResult;
 use crate::sql_types::BoolOrNullableBool;
 use crate::util::TupleAppend;
 

diesel/src/r2d2.rs

@@ -100,7 +100,6 @@ pub use r2d2::*;
 /// [`r2d2::Pool`]: r2d2::Pool
 pub type PoolError = r2d2::Error;
 
-use std::convert::Into;
 use std::fmt;
 use std::marker::PhantomData;
 

diesel/src/result.rs

@@ -1,6 +1,5 @@
 //! Errors, type aliases, and functions related to working with `Result`.
 
-use std::convert::From;
 use std::error::Error as StdError;
 use std::ffi::NulError;
 use std::fmt::{self, Display};