Fix doctests paths for nightly

Update rust nightly and clippy.
Beta isn't an allowed fail anymore.

Author: Eijebong

.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)

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 }

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)]

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,

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! {

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 {

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! {

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! {

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! {

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 {