diff --git a/.travis.yml b/.travis.yml
index bd7c4f8ed383..db85f2ed07d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,9 +39,8 @@ script:
 matrix:
   allow_failures:
     - rust: nightly
-    - rust: beta
   include:
-  - rust: nightly-2017-06-06
+  - rust: nightly-2017-08-31
     env: CLIPPY_AND_COMPILE_TESTS=YESPLEASE
     script:
     - (cd diesel && cargo rustc --no-default-features --features "lint unstable sqlite postgres mysql extras" -- -Zno-trans)
diff --git a/diesel/Cargo.toml b/diesel/Cargo.toml
index ab3b1f27611b..74984f25bb3c 100644
--- a/diesel/Cargo.toml
+++ b/diesel/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["database"]
 [dependencies]
 byteorder = "1.0"
 chrono = { version = "0.4", optional = true }
-clippy = { optional = true, version = "=0.0.138" }
+clippy = { optional = true, version = "=0.0.155" }
 libc = { version = "0.2.0", optional = true }
 libsqlite3-sys = { version = ">=0.8.0, <0.9.0", optional = true, features = ["min_sqlite_version_3_7_16"] }
 mysqlclient-sys = { version = ">=0.1.0, <0.3.0", optional = true }
diff --git a/diesel/src/associations/mod.rs b/diesel/src/associations/mod.rs
index ec07ad8d141d..c7076f704e5a 100644
--- a/diesel/src/associations/mod.rs
+++ b/diesel/src/associations/mod.rs
@@ -20,7 +20,7 @@
 //! // derive Identifiable.
 //! # #[macro_use] extern crate diesel;
 //! # #[macro_use] extern crate diesel_codegen;
-//! # include!("src/doctest_setup.rs");
+//! # include!("../doctest_setup.rs");
 //! use schema::{posts, users};
 //!
 //! #[derive(Identifiable, Queryable)]
diff --git a/diesel/src/connection/mod.rs b/diesel/src/connection/mod.rs
index bde91f721f35..51d2fc5389d3 100644
--- a/diesel/src/connection/mod.rs
+++ b/diesel/src/connection/mod.rs
@@ -44,7 +44,7 @@ pub trait Connection: SimpleConnection + Sized + Send {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// # table!(
     /// #    users(id) {
     /// #        id -> Integer,
diff --git a/diesel/src/expression/count.rs b/diesel/src/expression/count.rs
index 33f5a072cce1..e0dd4330d572 100644
--- a/diesel/src/expression/count.rs
+++ b/diesel/src/expression/count.rs
@@ -14,7 +14,7 @@ use types::BigInt;
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// # use diesel::expression::dsl::*;
 /// #
 /// # table! {
@@ -50,7 +50,7 @@ pub fn count<T: Expression>(t: T) -> Count<T> {
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// # use diesel::expression::dsl::*;
 /// #
 /// # table! {
diff --git a/diesel/src/expression/exists.rs b/diesel/src/expression/exists.rs
index 7fc68d7f947f..7c440c391c02 100644
--- a/diesel/src/expression/exists.rs
+++ b/diesel/src/expression/exists.rs
@@ -14,7 +14,7 @@ use types::Bool;
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/expression/functions/aggregate_folding.rs b/diesel/src/expression/functions/aggregate_folding.rs
index 96c4ab06fb49..d1b93db5c43e 100644
--- a/diesel/src/expression/functions/aggregate_folding.rs
+++ b/diesel/src/expression/functions/aggregate_folding.rs
@@ -53,7 +53,7 @@ Foldable.
 
 ```rust
 # #[macro_use] extern crate diesel;
-# include!(\"src/doctest_setup.rs\");
+# include!(\"../../doctest_setup.rs\");
 # use diesel::expression::dsl::*;
 #
 # table! {
@@ -78,7 +78,7 @@ Foldable.
 
 ```rust
 # #[macro_use] extern crate diesel;
-# include!(\"src/doctest_setup.rs\");
+# include!(\"../../doctest_setup.rs\");
 # use diesel::expression::dsl::*;
 #
 # table! {
diff --git a/diesel/src/expression/functions/aggregate_ordering.rs b/diesel/src/expression/functions/aggregate_ordering.rs
index 23aedc8ed43a..437f860bd1c5 100644
--- a/diesel/src/expression/functions/aggregate_ordering.rs
+++ b/diesel/src/expression/functions/aggregate_ordering.rs
@@ -52,7 +52,7 @@ ordered.
 
 ```rust
 # #[macro_use] extern crate diesel;
-# include!(\"src/doctest_setup.rs\");
+# include!(\"../../doctest_setup.rs\");
 # use diesel::expression::dsl::*;
 #
 # table! {
@@ -77,7 +77,7 @@ ordered.
 
 ```rust
 # #[macro_use] extern crate diesel;
-# include!(\"src/doctest_setup.rs\");
+# include!(\"../../doctest_setup.rs\");
 # use diesel::expression::dsl::*;
 #
 # table! {
diff --git a/diesel/src/expression/functions/date_and_time.rs b/diesel/src/expression/functions/date_and_time.rs
index 55207efb0ff2..e9d3922e8c03 100644
--- a/diesel/src/expression/functions/date_and_time.rs
+++ b/diesel/src/expression/functions/date_and_time.rs
@@ -38,7 +38,7 @@ expression, and the return value will be an expression of type Date.
 ```ignore
 # #[macro_use] extern crate diesel;
 # extern crate chrono;
-# include!(\"src/doctest_setup.rs\");
+# include!(\"../../doctest_setup.rs\");
 # use diesel::expression::dsl::*;
 #
 # table! {
diff --git a/diesel/src/expression/mod.rs b/diesel/src/expression/mod.rs
index 7e852e52e52d..3736e813c1b8 100644
--- a/diesel/src/expression/mod.rs
+++ b/diesel/src/expression/mod.rs
@@ -175,7 +175,7 @@ use query_builder::{QueryFragment, QueryId};
 /// # #[macro_use] extern crate diesel_codegen;
 /// # #[macro_use] extern crate diesel;
 /// # use diesel::types;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/expression/not.rs b/diesel/src/expression/not.rs
index 89c396745a43..b86fd6e61ca1 100644
--- a/diesel/src/expression/not.rs
+++ b/diesel/src/expression/not.rs
@@ -9,7 +9,7 @@ use types::Bool;
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/expression/operators.rs b/diesel/src/expression/operators.rs
index 00ff556b385a..4efff3919b59 100644
--- a/diesel/src/expression/operators.rs
+++ b/diesel/src/expression/operators.rs
@@ -135,7 +135,7 @@ macro_rules! __diesel_operator_to_sql {
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/expression/sql_literal.rs b/diesel/src/expression/sql_literal.rs
index da0f1ecd0f31..58a4aafb28df 100644
--- a/diesel/src/expression/sql_literal.rs
+++ b/diesel/src/expression/sql_literal.rs
@@ -41,7 +41,7 @@ impl<ST> SqlLiteral<ST> {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -72,7 +72,7 @@ impl<ST> SqlLiteral<ST> {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -158,7 +158,7 @@ impl<ST> NonAggregate for SqlLiteral<ST> {
 /// # #[macro_use] extern crate diesel_codegen;
 /// use diesel::expression::sql;
 /// use diesel::types::{Bool, Integer, Text};
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// # table! {
 /// #   users {
 /// #       id -> Integer,
diff --git a/diesel/src/expression_methods/escape_expression_methods.rs b/diesel/src/expression_methods/escape_expression_methods.rs
index 95111c9a3a80..bfe53308bd8d 100644
--- a/diesel/src/expression_methods/escape_expression_methods.rs
+++ b/diesel/src/expression_methods/escape_expression_methods.rs
@@ -9,7 +9,7 @@ use types::VarChar;
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/expression_methods/global_expression_methods.rs b/diesel/src/expression_methods/global_expression_methods.rs
index f6d0b736a0c1..bef96165568d 100644
--- a/diesel/src/expression_methods/global_expression_methods.rs
+++ b/diesel/src/expression_methods/global_expression_methods.rs
@@ -10,7 +10,7 @@ pub trait ExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -36,7 +36,7 @@ pub trait ExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -65,7 +65,7 @@ pub trait ExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -102,7 +102,7 @@ pub trait ExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -149,7 +149,7 @@ pub trait ExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -175,7 +175,7 @@ pub trait ExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -201,7 +201,7 @@ pub trait ExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -227,7 +227,7 @@ pub trait ExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -275,7 +275,7 @@ pub trait ExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -316,7 +316,7 @@ pub trait NullableExpressionMethods: Expression + Sized {
     /// ```no_run
     /// # #![allow(dead_code)]
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// # use self::diesel::types::*;
     /// #
     /// table! {
diff --git a/diesel/src/expression_methods/text_expression_methods.rs b/diesel/src/expression_methods/text_expression_methods.rs
index 62d1385056db..1db3965e432d 100644
--- a/diesel/src/expression_methods/text_expression_methods.rs
+++ b/diesel/src/expression_methods/text_expression_methods.rs
@@ -9,7 +9,7 @@ pub trait TextExpressionMethods: Expression<SqlType=Text> + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
diff --git a/diesel/src/macros/as_changeset.rs b/diesel/src/macros/as_changeset.rs
index d54d625f9f2a..1399172a06b9 100644
--- a/diesel/src/macros/as_changeset.rs
+++ b/diesel/src/macros/as_changeset.rs
@@ -19,7 +19,7 @@
 /// # #[macro_use] extern crate diesel_codegen;
 /// # #[macro_use] extern crate diesel;
 /// # table! { users { id -> Integer, name -> VarChar, } }
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 ///
 /// #[derive(PartialEq, Debug, Queryable)]
 /// struct User {
diff --git a/diesel/src/macros/macros_from_codegen.rs b/diesel/src/macros/macros_from_codegen.rs
index 447f6e7b4647..a3b32420b956 100644
--- a/diesel/src/macros/macros_from_codegen.rs
+++ b/diesel/src/macros/macros_from_codegen.rs
@@ -82,7 +82,7 @@ macro_rules! infer_table_from_schema {
 /// ```rust
 /// # #[macro_use] extern crate diesel;
 /// # #[macro_use] extern crate diesel_codegen;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// # table! {
 /// #   users {
 /// #       id -> Integer,
diff --git a/diesel/src/mysql/connection/raw.rs b/diesel/src/mysql/connection/raw.rs
index 1b87d8de146a..cce13c975e28 100644
--- a/diesel/src/mysql/connection/raw.rs
+++ b/diesel/src/mysql/connection/raw.rs
@@ -50,7 +50,7 @@ impl RawConnection {
                 user.as_ptr(),
                 password.map(CStr::as_ptr).unwrap_or_else(|| ptr::null_mut()),
                 database.map(CStr::as_ptr).unwrap_or_else(|| ptr::null_mut()),
-                port.unwrap_or(0) as u32,
+                u32::from(port.unwrap_or(0)),
                 ptr::null_mut(),
                 0,
             )
diff --git a/diesel/src/mysql/types/date_and_time.rs b/diesel/src/mysql/types/date_and_time.rs
index e34a29ec561c..a13b597be2de 100644
--- a/diesel/src/mysql/types/date_and_time.rs
+++ b/diesel/src/mysql/types/date_and_time.rs
@@ -69,7 +69,7 @@ impl ToSql<Timestamp, Mysql> for NaiveDateTime {
         mysql_time.hour = self.hour() as libc::c_uint;
         mysql_time.minute = self.minute() as libc::c_uint;
         mysql_time.second = self.second() as libc::c_uint;
-        mysql_time.second_part = self.timestamp_subsec_micros() as libc::c_ulong;
+        mysql_time.second_part = libc::c_ulong::from(self.timestamp_subsec_micros());
 
         <ffi::MYSQL_TIME as ToSql<Timestamp, Mysql>>::to_sql(&mysql_time, out)
     }
diff --git a/diesel/src/pg/expression/array_comparison.rs b/diesel/src/pg/expression/array_comparison.rs
index 58a0f6f142b8..73e5e8afdbf7 100644
--- a/diesel/src/pg/expression/array_comparison.rs
+++ b/diesel/src/pg/expression/array_comparison.rs
@@ -14,7 +14,7 @@ use types::Array;
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../../doctest_setup.rs");
 /// # use diesel::expression::dsl::*;
 /// #
 /// # table! {
@@ -50,7 +50,7 @@ pub fn any<ST, T>(vals: T) -> Any<T::Expression> where
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../../doctest_setup.rs");
 /// # use diesel::expression::dsl::*;
 /// #
 /// # table! {
diff --git a/diesel/src/pg/expression/expression_methods.rs b/diesel/src/pg/expression/expression_methods.rs
index 90581e0084a7..cc6b5e789ec1 100644
--- a/diesel/src/pg/expression/expression_methods.rs
+++ b/diesel/src/pg/expression/expression_methods.rs
@@ -11,7 +11,7 @@ pub trait PgExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -44,7 +44,7 @@ pub trait PgExpressionMethods: Expression + Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -98,7 +98,7 @@ pub trait ArrayExpressionMethods<ST>: Expression<SqlType=Array<ST>> + Sized {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     posts {
@@ -154,7 +154,7 @@ pub trait ArrayExpressionMethods<ST>: Expression<SqlType=Array<ST>> + Sized {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     posts {
@@ -206,7 +206,7 @@ pub trait ArrayExpressionMethods<ST>: Expression<SqlType=Array<ST>> + Sized {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     posts {
@@ -268,7 +268,7 @@ pub trait SortExpressionMethods : Sized {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -311,7 +311,7 @@ pub trait SortExpressionMethods : Sized {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
diff --git a/diesel/src/pg/expression/extensions/interval_dsl.rs b/diesel/src/pg/expression/extensions/interval_dsl.rs
index eec188bb8759..fc35ac6d61ab 100644
--- a/diesel/src/pg/expression/extensions/interval_dsl.rs
+++ b/diesel/src/pg/expression/extensions/interval_dsl.rs
@@ -12,7 +12,7 @@ use data_types::PgInterval;
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../../../doctest_setup.rs");
 /// # use diesel::expression::dsl::*;
 /// #
 /// # table! {
@@ -103,7 +103,7 @@ pub trait MicroIntervalDsl: Sized + Mul<Self, Output=Self> {
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../../../doctest_setup.rs");
 /// # use diesel::expression::dsl::*;
 /// #
 /// # table! {
@@ -191,7 +191,7 @@ impl MicroIntervalDsl for i64 {
     }
 
     fn times(self, x: i32) -> i64 {
-        self * x as i64
+        self * i64::from(x)
     }
 }
 
@@ -201,7 +201,7 @@ impl MicroIntervalDsl for f64 {
     }
 
     fn times(self, x: i32) -> f64 {
-        self * x as f64
+        self * f64::from(x)
     }
 }
 
@@ -235,7 +235,7 @@ impl DayAndMonthIntervalDsl for f64 {
     }
 
     fn times(self, x: i32) -> f64 {
-        self * x as f64
+        self * f64::from(x)
     }
 }
 
diff --git a/diesel/src/pg/types/date_and_time/chrono.rs b/diesel/src/pg/types/date_and_time/chrono.rs
index 43042344b215..46518a87ec95 100644
--- a/diesel/src/pg/types/date_and_time/chrono.rs
+++ b/diesel/src/pg/types/date_and_time/chrono.rs
@@ -111,7 +111,7 @@ impl ToSql<Date, Pg> for NaiveDate {
 impl FromSql<Date, Pg> for NaiveDate {
     fn from_sql(bytes: Option<&[u8]>) -> Result<Self, Box<Error+Send+Sync>> {
         let PgDate(offset) = try!(FromSql::<Date, Pg>::from_sql(bytes));
-        match pg_epoch_date().checked_add_signed(Duration::days(offset as i64)) {
+        match pg_epoch_date().checked_add_signed(Duration::days(i64::from(offset))) {
             Some(date) => Ok(date),
             None => {
                 let error_message = format!("Chrono can only represent dates up to {:?}",
diff --git a/diesel/src/pg/types/date_and_time/deprecated_time.rs b/diesel/src/pg/types/date_and_time/deprecated_time.rs
index 60c16cc08180..9d03dc57f593 100644
--- a/diesel/src/pg/types/date_and_time/deprecated_time.rs
+++ b/diesel/src/pg/types/date_and_time/deprecated_time.rs
@@ -11,7 +11,7 @@ use types::{self, ToSql, ToSqlOutput, FromSql, IsNull, Timestamp};
 expression_impls!(Timestamp -> Timespec);
 queryable_impls!(Timestamp -> Timespec);
 
-const TIME_SEC_CONV: i64 = 946684800;
+const TIME_SEC_CONV: i64 = 946_684_800;
 
 impl ToSql<types::Timestamp, Pg> for Timespec {
     fn to_sql<W: Write>(&self, out: &mut ToSqlOutput<W, Pg>) -> Result<IsNull, Box<Error+Send+Sync>> {
diff --git a/diesel/src/pg/types/date_and_time/std_time.rs b/diesel/src/pg/types/date_and_time/std_time.rs
index 87e14f85968d..9c9023c09bb7 100644
--- a/diesel/src/pg/types/date_and_time/std_time.rs
+++ b/diesel/src/pg/types/date_and_time/std_time.rs
@@ -9,7 +9,7 @@ expression_impls!(Timestamp -> SystemTime);
 queryable_impls!(Timestamp -> SystemTime);
 
 fn pg_epoch() -> SystemTime {
-    let thirty_years = Duration::from_secs(946684800);
+    let thirty_years = Duration::from_secs(946_684_800);
     UNIX_EPOCH + thirty_years
 }
 
@@ -56,7 +56,7 @@ fn usecs_to_duration(usecs_passed: u64) -> Duration {
 fn duration_to_usecs(duration: Duration) -> u64 {
     let seconds = duration.as_secs() * USEC_PER_SEC;
     let subseconds = duration.subsec_nanos() / NANO_PER_USEC;
-    seconds + subseconds as u64
+    seconds + u64::from(subseconds)
 }
 
 #[cfg(test)]
diff --git a/diesel/src/pg/types/mod.rs b/diesel/src/pg/types/mod.rs
index 636af39b75f8..237c3c8c5920 100644
--- a/diesel/src/pg/types/mod.rs
+++ b/diesel/src/pg/types/mod.rs
@@ -177,7 +177,7 @@ pub mod sql_types {
     /// extern crate serde_json;
     /// # #[macro_use] extern crate diesel_codegen;
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -252,7 +252,7 @@ pub mod sql_types {
     /// # #![allow(dead_code)]
     /// # #[macro_use] extern crate diesel_codegen;
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -323,7 +323,7 @@ pub mod sql_types {
     /// # #![allow(dead_code)]
     /// # #[macro_use] extern crate diesel_codegen;
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -395,7 +395,7 @@ pub mod sql_types {
     /// # #![allow(dead_code)]
     /// # #[macro_use] extern crate diesel_codegen;
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -465,7 +465,7 @@ pub mod sql_types {
     /// # #![allow(dead_code)]
     /// # #[macro_use] extern crate diesel_codegen;
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
diff --git a/diesel/src/pg/types/numeric.rs b/diesel/src/pg/types/numeric.rs
index ac11f4393d94..488fb032fa9d 100644
--- a/diesel/src/pg/types/numeric.rs
+++ b/diesel/src/pg/types/numeric.rs
@@ -25,7 +25,7 @@ mod bigdecimal {
 
         fn next(&mut self) -> Option<Self::Item> {
             self.0.take().map(|v| {
-                let (div, rem) = v.div_rem(&BigUint::from(10000u16));
+                let (div, rem) = v.div_rem(&BigUint::from(10_000u16));
                 if !div.is_zero() {
                     self.0 = Some(div);
                 }
@@ -109,7 +109,7 @@ mod bigdecimal {
                 result = result + BigUint::from(digit as u64);
             }
             // First digit got factor 10_000^(digits.len() - 1), but should get 10_000^weight
-            let correction_exp = 4 * ( (weight as i64) - count + 1);
+            let correction_exp = 4 * (i64::from(weight) - count + 1);
             // FIXME: `scale` allows to drop some insignificant figures, which is currently unimplemented.
             // This means that e.g. PostgreSQL 0.01 will be interpreted as 0.0100
             let result = BigDecimal::new(BigInt::from_biguint(sign, result), -correction_exp);
diff --git a/diesel/src/pg/upsert/on_conflict_actions.rs b/diesel/src/pg/upsert/on_conflict_actions.rs
index ebe6c5f3f1fa..ad835f0e6c5c 100644
--- a/diesel/src/pg/upsert/on_conflict_actions.rs
+++ b/diesel/src/pg/upsert/on_conflict_actions.rs
@@ -30,7 +30,7 @@ pub fn do_nothing() -> DoNothing {
 /// ```rust
 /// # #[macro_use] extern crate diesel;
 /// # #[macro_use] extern crate diesel_codegen;
-/// # include!("src/pg/upsert/on_conflict_docs_setup.rs");
+/// # include!("on_conflict_docs_setup.rs");
 /// #
 /// # fn main() {
 /// #     use self::users::dsl::*;
@@ -58,7 +58,7 @@ pub fn do_nothing() -> DoNothing {
 /// ```rust
 /// # #[macro_use] extern crate diesel;
 /// # #[macro_use] extern crate diesel_codegen;
-/// # include!("src/pg/upsert/on_conflict_docs_setup.rs");
+/// # include!("on_conflict_docs_setup.rs");
 /// #
 /// # fn main() {
 /// #     use self::users::dsl::*;
@@ -86,7 +86,7 @@ pub fn do_nothing() -> DoNothing {
 /// ```rust
 /// # #[macro_use] extern crate diesel;
 /// # #[macro_use] extern crate diesel_codegen;
-/// # include!("src/pg/upsert/on_conflict_docs_setup.rs");
+/// # include!("on_conflict_docs_setup.rs");
 /// #
 /// # fn main() {
 /// #     use self::users::dsl::*;
diff --git a/diesel/src/pg/upsert/on_conflict_docs_setup.rs b/diesel/src/pg/upsert/on_conflict_docs_setup.rs
index 154004024048..98a8d2fb2e78 100644
--- a/diesel/src/pg/upsert/on_conflict_docs_setup.rs
+++ b/diesel/src/pg/upsert/on_conflict_docs_setup.rs
@@ -1,4 +1,4 @@
-include!("src/doctest_setup.rs");
+include!("../../doctest_setup.rs");
 
 table! {
     users {
diff --git a/diesel/src/pg/upsert/on_conflict_extension.rs b/diesel/src/pg/upsert/on_conflict_extension.rs
index dacddb23ce5e..1ca85a34fdf3 100644
--- a/diesel/src/pg/upsert/on_conflict_extension.rs
+++ b/diesel/src/pg/upsert/on_conflict_extension.rs
@@ -13,7 +13,7 @@ pub trait OnConflictExtension {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/pg/upsert/on_conflict_docs_setup.rs");
+    /// # include!("on_conflict_docs_setup.rs");
     /// #
     /// # fn main() {
     /// #     use self::users::dsl::*;
@@ -38,7 +38,7 @@ pub trait OnConflictExtension {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/pg/upsert/on_conflict_docs_setup.rs");
+    /// # include!("on_conflict_docs_setup.rs");
     /// #
     /// # fn main() {
     /// #     use self::users::dsl::*;
@@ -59,7 +59,7 @@ pub trait OnConflictExtension {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/pg/upsert/on_conflict_docs_setup.rs");
+    /// # include!("on_conflict_docs_setup.rs");
     /// #
     /// # fn main() {
     /// #     use self::users::dsl::*;
@@ -100,7 +100,7 @@ pub trait OnConflictExtension {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/pg/upsert/on_conflict_docs_setup.rs");
+    /// # include!("on_conflict_docs_setup.rs");
     /// #
     /// # fn main() {
     /// #     use self::users::dsl::*;
@@ -132,7 +132,7 @@ pub trait OnConflictExtension {
     /// ```rust
     /// # #[macro_use] extern crate diesel;
     /// # #[macro_use] extern crate diesel_codegen;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
diff --git a/diesel/src/pg/upsert/on_conflict_target.rs b/diesel/src/pg/upsert/on_conflict_target.rs
index cbba0fdeaf43..ed578dc62371 100644
--- a/diesel/src/pg/upsert/on_conflict_target.rs
+++ b/diesel/src/pg/upsert/on_conflict_target.rs
@@ -13,7 +13,7 @@ use result::QueryResult;
 /// ```rust
 /// # #[macro_use] extern crate diesel;
 /// # #[macro_use] extern crate diesel_codegen;
-/// # include!("src/pg/upsert/on_conflict_docs_setup.rs");
+/// # include!("on_conflict_docs_setup.rs");
 /// #
 /// # fn main() {
 /// #     use self::users::dsl::*;
diff --git a/diesel/src/query_builder/delete_statement.rs b/diesel/src/query_builder/delete_statement.rs
index 33810034aa88..e8307821bec6 100644
--- a/diesel/src/query_builder/delete_statement.rs
+++ b/diesel/src/query_builder/delete_statement.rs
@@ -70,7 +70,7 @@ impl<T, U> DeleteStatement<T, U, NoReturningClause> {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
diff --git a/diesel/src/query_builder/functions.rs b/diesel/src/query_builder/functions.rs
index 5a7024b53738..04fa26297017 100644
--- a/diesel/src/query_builder/functions.rs
+++ b/diesel/src/query_builder/functions.rs
@@ -12,7 +12,7 @@ use super::{IntoUpdateTarget, IncompleteUpdateStatement, IncompleteInsertStateme
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
@@ -42,7 +42,7 @@ use super::{IntoUpdateTarget, IncompleteUpdateStatement, IncompleteInsertStateme
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
@@ -86,7 +86,7 @@ pub fn update<T: IntoUpdateTarget>(source: T) -> IncompleteUpdateStatement<T::Ta
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
@@ -114,7 +114,7 @@ pub fn update<T: IntoUpdateTarget>(source: T) -> IncompleteUpdateStatement<T::Ta
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
@@ -149,7 +149,7 @@ pub fn delete<T: IntoUpdateTarget>(source: T) -> DeleteStatement<T::Table, T::Wh
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
@@ -188,7 +188,7 @@ pub fn delete<T: IntoUpdateTarget>(source: T) -> DeleteStatement<T::Table, T::Wh
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/query_builder/insert_statement.rs b/diesel/src/query_builder/insert_statement.rs
index 7436a0a73e12..d431bbfc5ff2 100644
--- a/diesel/src/query_builder/insert_statement.rs
+++ b/diesel/src/query_builder/insert_statement.rs
@@ -149,7 +149,7 @@ impl<T, U, Op> InsertStatement<T, U, Op, NoReturningClause> {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
@@ -221,7 +221,7 @@ impl<T, U, Op> BatchInsertStatement<T, U, Op> {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
diff --git a/diesel/src/query_builder/mod.rs b/diesel/src/query_builder/mod.rs
index 3318b156d7b1..fc2e4e2b040e 100644
--- a/diesel/src/query_builder/mod.rs
+++ b/diesel/src/query_builder/mod.rs
@@ -163,7 +163,7 @@ impl<T: Query> AsQuery for T {
 /// ### Returning SQL from a count statement:
 ///
 /// ```rust
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # #[macro_use] extern crate diesel;
 /// # use diesel::*;
diff --git a/diesel/src/query_builder/update_statement/mod.rs b/diesel/src/query_builder/update_statement/mod.rs
index 493bb13b3598..1e7557497b91 100644
--- a/diesel/src/query_builder/update_statement/mod.rs
+++ b/diesel/src/query_builder/update_statement/mod.rs
@@ -102,7 +102,7 @@ impl<T, U, V> UpdateStatement<T, U, V, NoReturningClause> {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
diff --git a/diesel/src/query_dsl/boxed_dsl.rs b/diesel/src/query_dsl/boxed_dsl.rs
index 9e38c4c9490c..7d7c701da665 100644
--- a/diesel/src/query_dsl/boxed_dsl.rs
+++ b/diesel/src/query_dsl/boxed_dsl.rs
@@ -33,7 +33,7 @@ impl<'a, T, DB> InternalBoxedDsl<'a, DB> for T where
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
@@ -70,7 +70,7 @@ impl<'a, T, DB> InternalBoxedDsl<'a, DB> for T where
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/query_dsl/count_dsl.rs b/diesel/src/query_dsl/count_dsl.rs
index d66e664970cd..95ab42049b14 100644
--- a/diesel/src/query_dsl/count_dsl.rs
+++ b/diesel/src/query_dsl/count_dsl.rs
@@ -8,7 +8,7 @@ use super::SelectDsl;
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/query_dsl/distinct_dsl.rs b/diesel/src/query_dsl/distinct_dsl.rs
index fe0dd296d72b..bd73e880125b 100644
--- a/diesel/src/query_dsl/distinct_dsl.rs
+++ b/diesel/src/query_dsl/distinct_dsl.rs
@@ -8,7 +8,7 @@ use query_source::Table;
 /// ```rust
 ///
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/query_dsl/filter_dsl.rs b/diesel/src/query_dsl/filter_dsl.rs
index dcb515dd7b5d..f2d0a4c505cd 100644
--- a/diesel/src/query_dsl/filter_dsl.rs
+++ b/diesel/src/query_dsl/filter_dsl.rs
@@ -11,7 +11,7 @@ use query_source::*;
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
@@ -54,7 +54,7 @@ impl<T, U, Predicate> FilterDsl<Predicate> for T where
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/query_dsl/join_dsl.rs b/diesel/src/query_dsl/join_dsl.rs
index ac197758a874..586a843f811e 100644
--- a/diesel/src/query_dsl/join_dsl.rs
+++ b/diesel/src/query_dsl/join_dsl.rs
@@ -116,7 +116,7 @@ pub trait JoinOnDsl: Sized {
     ///
     /// ```rust
     /// # #[macro_use] extern crate diesel;
-    /// # include!("src/doctest_setup.rs");
+    /// # include!("../doctest_setup.rs");
     /// #
     /// # table! {
     /// #     users {
diff --git a/diesel/src/query_dsl/order_dsl.rs b/diesel/src/query_dsl/order_dsl.rs
index cdcf19c5dd56..0d4bd620b07e 100644
--- a/diesel/src/query_dsl/order_dsl.rs
+++ b/diesel/src/query_dsl/order_dsl.rs
@@ -17,7 +17,7 @@ use query_source::Table;
 ///
 /// ```rust
 /// # #[macro_use] extern crate diesel;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel/src/sqlite/connection/stmt.rs b/diesel/src/sqlite/connection/stmt.rs
index 7686ed03cede..faf61bc63de5 100644
--- a/diesel/src/sqlite/connection/stmt.rs
+++ b/diesel/src/sqlite/connection/stmt.rs
@@ -79,7 +79,7 @@ impl Statement {
                 ffi::sqlite3_bind_double(
                     self.inner_statement,
                     self.bind_index,
-                    value as libc::c_double,
+                    libc::c_double::from(value),
                 )
             }
             (SqliteType::Double, Some(bytes)) => {
@@ -95,7 +95,7 @@ impl Statement {
                 ffi::sqlite3_bind_int(
                     self.inner_statement,
                     self.bind_index,
-                    value as libc::c_int,
+                    libc::c_int::from(value),
                 )
             }
             (SqliteType::Integer, Some(bytes)) => {
diff --git a/diesel/src/sqlite/query_builder/functions.rs b/diesel/src/sqlite/query_builder/functions.rs
index f07e40525256..4de649c4c143 100644
--- a/diesel/src/sqlite/query_builder/functions.rs
+++ b/diesel/src/sqlite/query_builder/functions.rs
@@ -9,7 +9,7 @@ use super::nodes::Replace;
 /// ```rust
 /// # #[macro_use] extern crate diesel;
 /// # #[macro_use] extern crate diesel_codegen;
-/// # include!("src/doctest_setup.rs");
+/// # include!("../../doctest_setup.rs");
 /// #
 /// # table! {
 /// #     users {
diff --git a/diesel_cli/Cargo.toml b/diesel_cli/Cargo.toml
index afe9990759fd..049b5f423c5e 100644
--- a/diesel_cli/Cargo.toml
+++ b/diesel_cli/Cargo.toml
@@ -20,7 +20,7 @@ clap = "2.20.3"
 diesel = { version = "0.16.0", default-features = false }
 dotenv = ">=0.8, <0.11"
 diesel_infer_schema = "0.16.0"
-clippy = { optional = true, version = "=0.0.138" }
+clippy = { optional = true, version = "=0.0.155" }
 
 [dev-dependencies]
 difference = "1.0"
diff --git a/diesel_cli/tests/database_reset.rs b/diesel_cli/tests/database_reset.rs
index bdb7c627c635..e435ebc3c067 100644
--- a/diesel_cli/tests/database_reset.rs
+++ b/diesel_cli/tests/database_reset.rs
@@ -1,3 +1,4 @@
+#[cfg(feature = "postgres")]
 extern crate url;
 
 use support::{database, project};
diff --git a/diesel_cli/tests/support/project_builder.rs b/diesel_cli/tests/support/project_builder.rs
index eba70c4c5a5c..35cd23761b6f 100644
--- a/diesel_cli/tests/support/project_builder.rs
+++ b/diesel_cli/tests/support/project_builder.rs
@@ -1,4 +1,6 @@
+#[cfg(not(feature = "sqlite"))]
 extern crate url;
+#[cfg(not(feature = "sqlite"))]
 extern crate dotenv;
 
 use std::fs::{self, File};
diff --git a/diesel_codegen/Cargo.toml b/diesel_codegen/Cargo.toml
index 969073ab650b..4ac8f05e8358 100644
--- a/diesel_codegen/Cargo.toml
+++ b/diesel_codegen/Cargo.toml
@@ -16,7 +16,7 @@ quote = "0.3.12"
 dotenv = { version = ">=0.8, <0.11", optional = true, default-features = false }
 diesel = { version = "0.16.0", default-features = false }
 diesel_infer_schema = { version = "0.16.0", default-features = false, optional = true }
-clippy = { optional = true, version = "=0.0.138" }
+clippy = { optional = true, version = "=0.0.155" }
 
 [dev-dependencies]
 tempdir = "0.3.4"
diff --git a/diesel_codegen/src/lib.rs b/diesel_codegen/src/lib.rs
index bd21a0400cbb..a00b6791145a 100644
--- a/diesel_codegen/src/lib.rs
+++ b/diesel_codegen/src/lib.rs
@@ -22,7 +22,7 @@ macro_rules! t {
     };
 }
 
-#[cfg(feature = "dotenv")]
+#[cfg(all(feature = "dotenv", feature = "diesel_infer_schema"))]
 extern crate dotenv;
 #[cfg(feature = "diesel_infer_schema")]
 extern crate diesel_infer_schema;
diff --git a/diesel_compile_tests/Cargo.toml b/diesel_compile_tests/Cargo.toml
index d7c53fc02a26..d5d29bdeea7d 100644
--- a/diesel_compile_tests/Cargo.toml
+++ b/diesel_compile_tests/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Sean Griffin <sean@seantheprogrammer.com>"]
 [dependencies]
 diesel = { version = "0.16.0", features = ["extras", "sqlite", "postgres", "mysql"] }
 diesel_codegen = { version = "0.16.0" }
-compiletest_rs = "=0.2.7"
+compiletest_rs = "=0.2.9"
 
 [replace]
 "diesel:0.16.0" = { path = "../diesel" }
diff --git a/diesel_compile_tests/tests/compile-fail/find_requires_correct_type.rs b/diesel_compile_tests/tests/compile-fail/find_requires_correct_type.rs
index 757e468104bf..5a9c62d32c8d 100644
--- a/diesel_compile_tests/tests/compile-fail/find_requires_correct_type.rs
+++ b/diesel_compile_tests/tests/compile-fail/find_requires_correct_type.rs
@@ -21,10 +21,8 @@ fn main() {
     //~^ ERROR no method named `first`
     //~| ERROR E0277
     //~| ERROR E0277
-    //~| ERROR E0277
     string_primary_key::table.find(1).first(&connection).unwrap();
     //~^ ERROR no method named `first`
     //~| ERROR E0277
     //~| ERROR E0277
-    //~| ERROR E0277
 }
diff --git a/diesel_compile_tests/tests/compile-fail/insert_default_values_statement_does_not_support_returning_methods_on_sqlite.rs b/diesel_compile_tests/tests/compile-fail/insert_default_values_statement_does_not_support_returning_methods_on_sqlite.rs
index 5f1c3989989b..ecc1b10eab7a 100644
--- a/diesel_compile_tests/tests/compile-fail/insert_default_values_statement_does_not_support_returning_methods_on_sqlite.rs
+++ b/diesel_compile_tests/tests/compile-fail/insert_default_values_statement_does_not_support_returning_methods_on_sqlite.rs
@@ -2,7 +2,7 @@
 extern crate diesel;
 
 use diesel::*;
-use diesel::sqlite::{Sqlite, SqliteQueryBuilder, SqliteConnection};
+use diesel::sqlite::SqliteConnection;
 use diesel::backend::Backend;
 use diesel::types::{Integer, VarChar};
 
diff --git a/diesel_compile_tests/tests/compile-fail/insert_statement_does_not_support_returning_methods_on_sqlite.rs b/diesel_compile_tests/tests/compile-fail/insert_statement_does_not_support_returning_methods_on_sqlite.rs
index 3bbe7202e28e..9983cbc203dc 100644
--- a/diesel_compile_tests/tests/compile-fail/insert_statement_does_not_support_returning_methods_on_sqlite.rs
+++ b/diesel_compile_tests/tests/compile-fail/insert_statement_does_not_support_returning_methods_on_sqlite.rs
@@ -2,7 +2,7 @@
 extern crate diesel;
 
 use diesel::*;
-use diesel::sqlite::{Sqlite, SqliteQueryBuilder, SqliteConnection};
+use diesel::sqlite::SqliteConnection;
 use diesel::backend::Backend;
 use diesel::types::{Integer, VarChar};
 
diff --git a/diesel_compile_tests/tests/compile-fail/must_use_query_methods.rs b/diesel_compile_tests/tests/compile-fail/must_use_query_methods.rs
index 9a0ba498c389..0f6862938ca0 100644
--- a/diesel_compile_tests/tests/compile-fail/must_use_query_methods.rs
+++ b/diesel_compile_tests/tests/compile-fail/must_use_query_methods.rs
@@ -16,15 +16,15 @@ fn main() {
     use stuff::table as st;
     use stuff::b;
 
-    st.select(b); //~ ERROR unused result
-    st.select(b).distinct(); //~ ERROR unused result
-    st.count(); //~ ERROR unused result
-    st.order(b); //~ ERROR unused result
-    st.limit(1); //~ ERROR unused result
-    st.offset(1); //~ ERROR unused result
-
-    st.filter(b.eq(true)); //~ ERROR unused result
-    st.filter(b.eq(true)).limit(1); //~ ERROR unused result
+    st.select(b); //~ ERROR unused `diesel::query_builder::SelectStatement`
+    st.select(b).distinct(); //~ ERROR unused `diesel::query_builder::SelectStatement`
+    st.count(); //~ ERROR unused `diesel::query_builder::SelectStatement`
+    st.order(b); //~ ERROR unused `diesel::query_builder::SelectStatement`
+    st.limit(1); //~ ERROR unused `diesel::query_builder::SelectStatement`
+    st.offset(1); //~ ERROR unused `diesel::query_builder::SelectStatement`
+
+    st.filter(b.eq(true)); //~ ERROR unused `diesel::query_builder::SelectStatement`
+    st.filter(b.eq(true)).limit(1); //~ ERROR unused `diesel::query_builder::SelectStatement`
 
     let _thingies = st.filter(b.eq(true)); // No ERROR
 }
diff --git a/diesel_compile_tests/tests/compile-fail/right_side_of_left_join_requires_nullable.rs b/diesel_compile_tests/tests/compile-fail/right_side_of_left_join_requires_nullable.rs
index e49709dec7ec..daeb145170cd 100644
--- a/diesel_compile_tests/tests/compile-fail/right_side_of_left_join_requires_nullable.rs
+++ b/diesel_compile_tests/tests/compile-fail/right_side_of_left_join_requires_nullable.rs
@@ -38,5 +38,7 @@ fn main() {
     //~^ ERROR E0271
     //~| ERROR E0271
     // Invalid, Nullable<title> is selectable, but lower expects not-null
-    let _ = join.select(lower(posts::title.nullable())); //~ ERROR E0271
+    let _ = join.select(lower(posts::title.nullable()));
+    //~^ ERROR E0271
+    //~| ERROR E0271
 }
diff --git a/diesel_compile_tests/tests/compile-fail/table_invalid_syntax_1.rs b/diesel_compile_tests/tests/compile-fail/table_invalid_syntax_1.rs
index 181223e4e3fb..ee82e69e457a 100644
--- a/diesel_compile_tests/tests/compile-fail/table_invalid_syntax_1.rs
+++ b/diesel_compile_tests/tests/compile-fail/table_invalid_syntax_1.rs
@@ -2,7 +2,7 @@
 
 table! {
     12
-    //~^ ERROR expected ident
 }
+// error-pattern: invalid table! syntax
 
 fn main() {}
diff --git a/diesel_compile_tests/tests/compile-fail/table_invalid_syntax_3.rs b/diesel_compile_tests/tests/compile-fail/table_invalid_syntax_3.rs
index 96730ae8ecda..393b1dc269dd 100644
--- a/diesel_compile_tests/tests/compile-fail/table_invalid_syntax_3.rs
+++ b/diesel_compile_tests/tests/compile-fail/table_invalid_syntax_3.rs
@@ -2,10 +2,10 @@
 
 table! {
      #[foobar]
-     //~^ ERROR expected ident, found #
      posts {
          id -> Integer,
      }
 }
+// error-pattern: invalid table! syntax
 
 fn main() {}
diff --git a/diesel_compile_tests/tests/compile-fail/upsert_cannot_be_nested.rs b/diesel_compile_tests/tests/compile-fail/upsert_cannot_be_nested.rs
index 5ca3d2f970ed..3a2076090a4f 100644
--- a/diesel_compile_tests/tests/compile-fail/upsert_cannot_be_nested.rs
+++ b/diesel_compile_tests/tests/compile-fail/upsert_cannot_be_nested.rs
@@ -28,17 +28,9 @@ fn main() {
     insert(&NewUser("Sean").on_conflict(id, do_nothing()).on_conflict(id, do_nothing())).into(users).execute(&connection);
     //~^ ERROR no method named `execute`
     insert(&vec![NewUser("Sean").on_conflict_do_nothing()]).into(users).execute(&connection);
-    //~^ ERROR E0277
-    //~| ERROR E0277
-    //~| ERROR E0277
+    //~^ ERROR E0061
     insert(&vec![&NewUser("Sean").on_conflict_do_nothing()]).into(users).execute(&connection);
-    //~^ ERROR no method named `execute`
-    //~| ERROR E0277
-    //~| ERROR E0277
-    //~| ERROR E0277
+    //~^ ERROR E0061
     insert(&vec![&NewUser("Sean").on_conflict(id, do_nothing())]).into(users).execute(&connection);
-    //~^ ERROR no method named `execute`
-    //~| ERROR E0277
-    //~| ERROR E0277
-    //~| ERROR E0277
+    //~^ ERROR E0061
 }
diff --git a/diesel_infer_schema/Cargo.toml b/diesel_infer_schema/Cargo.toml
index 865c7e999bb3..3c5332a5f045 100644
--- a/diesel_infer_schema/Cargo.toml
+++ b/diesel_infer_schema/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["orm", "database", "postgres", "postgresql", "sql"]
 
 [dependencies]
 diesel = { version = "0.16.0", default-features = false }
-clippy = { optional = true, version = "=0.0.138" }
+clippy = { optional = true, version = "=0.0.155" }
 
 [dev-dependencies]
 dotenv = ">=0.8, <0.11"