Merge pull request diesel-rs#1789 from diesel-rs/sg-bump-nightly

Update to nightly-2018-07-17

Author: sgrif

.travis.yml

@@ -38,13 +38,11 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-  - rust: nightly-2018-04-19
+  - rust: nightly-2018-07-17
     env: CLIPPY_AND_COMPILE_TESTS=YESPLEASE
     script:
-    - (cd diesel && cargo rustc --no-default-features --features "lint sqlite postgres mysql extras" -- -Zno-trans)
-    - (cd diesel_cli && cargo rustc --no-default-features --features "lint sqlite postgres mysql" -- -Zno-trans)
-    - (cd diesel_derives && cargo rustc --no-default-features --features "lint" -- -Zno-trans)
-    - (cd diesel_migrations && cargo rustc --no-default-features --features "lint dotenv sqlite postgres mysql" -- -Zno-trans)
+    - rustup component add clippy-preview
+    - cargo clippy
     - (cd diesel_compile_tests && travis-cargo test)
   - rust: 1.26.1
     env: RUSTFMT=YESPLEASE

bin/check

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-CLIPPY="lint"
-
 if [ "$1" = "integration" ]; then
   if [ "$2" ]; then
     BACKEND="$2"
@@ -14,32 +12,32 @@ if [ "$1" = "integration" ]; then
   if [ "$BACKEND" = "mysql" ]; then
     export RUST_TEST_THREADS=1
   fi
-  (cd diesel_tests && cargo test --features "$CLIPPY $BACKEND" --no-default-features $*)
+  (cd diesel_tests && cargo test --features "$BACKEND" --no-default-features $*)
 elif [ "$1" = "compile" ]; then
   shift
   (cd diesel_compile_tests && cargo test $*)
 else
-  (cd diesel && cargo test --no-default-features --features "$CLIPPY extras sqlite postgres mysql" $*)
+  (cd diesel && cargo test --no-default-features --features "extras sqlite postgres mysql" $*)
 
-  (cd diesel_cli && cargo test --features "$CLIPPY sqlite" --no-default-features $*)
-  (cd diesel_migrations && cargo test --features "$CLIPPY sqlite" $*)
-  (cd diesel_derives && cargo test --features "$CLIPPY diesel/sqlite" $*)
-  (cd diesel_tests && cargo test --features "$CLIPPY sqlite" --no-default-features $*)
+  (cd diesel_cli && cargo test --features "sqlite" --no-default-features $*)
+  (cd diesel_migrations && cargo test --features "sqlite" $*)
+  (cd diesel_derives && cargo test --features "diesel/sqlite" $*)
+  (cd diesel_tests && cargo test --features "sqlite" --no-default-features $*)
 
-  (cd diesel_migrations && cargo test --features "$CLIPPY postgres" $*)
-  (cd diesel_derives && cargo test --features "$CLIPPY diesel/postgres" $*)
-  (cd diesel_cli && cargo test --features "$CLIPPY postgres" --no-default-features $*)
-  (cd diesel_tests && cargo test --features "$CLIPPY postgres" --no-default-features $*)
+  (cd diesel_migrations && cargo test --features "postgres" $*)
+  (cd diesel_derives && cargo test --features "diesel/postgres" $*)
+  (cd diesel_cli && cargo test --features "postgres" --no-default-features $*)
+  (cd diesel_tests && cargo test --features "postgres" --no-default-features $*)
 
   export RUST_TEST_THREADS=1
-  (cd diesel_migrations && cargo test --features "$CLIPPY mysql" $*)
-  (cd diesel_derives && cargo test --features "$CLIPPY diesel/mysql" $*)
-  (cd diesel_cli && cargo test --features "$CLIPPY mysql" --no-default-features $*)
-  (cd diesel_tests && cargo test --features "$CLIPPY mysql" --no-default-features $*)
+  (cd diesel_migrations && cargo test --features "mysql" $*)
+  (cd diesel_derives && cargo test --features "diesel/mysql" $*)
+  (cd diesel_cli && cargo test --features "mysql" --no-default-features $*)
+  (cd diesel_tests && cargo test --features "mysql" --no-default-features $*)
   unset RUST_TEST_THREADS
 
   (cd diesel_compile_tests && cargo test $*)
-  (cd diesel_migrations/migrations_internals && cargo test --features "$CLIPPY" $*)
-  (cd diesel_migrations/migrations_macros && cargo test --features "$CLIPPY" $*)
+  (cd diesel_migrations/migrations_internals && cargo test $*)
+  (cd diesel_migrations/migrations_macros && cargo test $*)
   (cd examples && ./test_all $*)
 fi;

bin/test

@@ -15,7 +15,6 @@ categories = ["database"]
 byteorder = "1.0"
 diesel_derives = "~1.3.0"
 chrono = { version = "0.4", optional = true }
-clippy = { optional = true, version = "=0.0.195" }
 libc = { version = "0.2.0", optional = true }
 libsqlite3-sys = { version = ">=0.8.0, <0.10.0", optional = true, features = ["min_sqlite_version_3_7_16"] }
 mysqlclient-sys = { version = ">=0.1.0, <0.3.0", optional = true }
@@ -43,7 +42,6 @@ tempdir = "^0.3.4"
 default = ["with-deprecated", "32-column-tables"]
 extras = ["chrono", "serde_json", "uuid", "deprecated-time", "network-address", "numeric", "r2d2"]
 unstable = ["diesel_derives/nightly"]
-lint = ["clippy"]
 large-tables = ["32-column-tables"]
 huge-tables = ["64-column-tables"]
 x32-column-tables = ["32-column-tables"]

diesel/Cargo.toml

@@ -108,7 +108,7 @@ pub struct StatementCache<DB: Backend, Statement> {
     pub cache: RefCell<HashMap<StatementCacheKey<DB>, Statement>>,
 }
 
-#[cfg_attr(feature = "clippy", allow(len_without_is_empty, new_without_default_derive))]
+#[cfg_attr(feature = "cargo-clippy", allow(len_without_is_empty, new_without_default_derive))]
 impl<DB, Statement> StatementCache<DB, Statement>
 where
     DB: Backend,
@@ -250,7 +250,7 @@ where
         Ok(x) => x,
         Err(e) => {
             error = Some(e);
-            #[cfg_attr(feature = "clippy", allow(invalid_ref))]
+            #[cfg_attr(feature = "cargo-clippy", allow(invalid_ref))]
             unsafe {
                 mem::uninitialized()
             }

diesel/src/connection/statement_cache.rs

@@ -130,32 +130,29 @@
 // Built-in Lints
 #![deny(warnings, missing_debug_implementations, missing_copy_implementations, missing_docs)]
 // Clippy lints
-#![cfg_attr(feature = "clippy", allow(unstable_features))]
-#![cfg_attr(feature = "clippy", feature(plugin))]
-#![cfg_attr(feature = "clippy", plugin(clippy(conf_file = "../../clippy.toml")))]
 #![cfg_attr(
-    feature = "clippy",
+    feature = "cargo-clippy",
     allow(
         option_map_unwrap_or_else, option_map_unwrap_or, match_same_arms, type_complexity,
         redundant_field_names
     )
 )]
 #![cfg_attr(
-    feature = "clippy",
+    feature = "cargo-clippy",
     warn(
         option_unwrap_used, result_unwrap_used, print_stdout, wrong_pub_self_convention, mut_mut,
         non_ascii_literal, similar_names, unicode_not_nfc, enum_glob_use, if_not_else,
         items_after_statements, used_underscore_binding
     )
 )]
-#![cfg_attr(all(test, feature = "clippy"), allow(option_unwrap_used, result_unwrap_used))]
+#![cfg_attr(all(test, feature = "cargo-clippy"), allow(option_unwrap_used, result_unwrap_used))]
 
 #[cfg(feature = "postgres")]
 #[macro_use]
 extern crate bitflags;
 extern crate byteorder;
-// This is required to make `diesel_derives` re-export, but clippy thinks its unused
-#[cfg_attr(feature = "clippy", allow(useless_attribute))]
+// This is required to make `diesel_derives` re-export, but cargo-clippy thinks its unused
+#[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
 #[allow(unused_imports)]
 #[macro_use]
 extern crate diesel_derives;

diesel/src/lib.rs

@@ -79,7 +79,7 @@ impl From<io::Error> for MigrationError {
 
 /// Errors that occur while running migrations
 #[derive(Debug, PartialEq)]
-#[cfg_attr(feature = "clippy", allow(enum_variant_names))]
+#[cfg_attr(feature = "cargo-clippy", allow(enum_variant_names))]
 pub enum RunMigrationsError {
     /// A general migration error occured
     MigrationError(MigrationError),

diesel/src/migration/errors.rs

@@ -11,7 +11,7 @@ pub struct StatementIterator<'a> {
     output_binds: Binds,
 }
 
-#[cfg_attr(feature = "clippy", allow(should_implement_trait))] // don't neet `Iterator` here
+#[cfg_attr(feature = "cargo-clippy", allow(should_implement_trait))] // don't neet `Iterator` here
 impl<'a> StatementIterator<'a> {
     pub fn new(stmt: &'a mut Statement, types: Vec<(MysqlType, IsSigned)>) -> QueryResult<Self> {
         let mut output_binds = Binds::from_output_types(types);
@@ -70,7 +70,7 @@ pub struct NamedStatementIterator<'a> {
     metadata: StatementMetadata,
 }
 
-#[cfg_attr(feature = "clippy", allow(should_implement_trait))] // don't need `Iterator` here
+#[cfg_attr(feature = "cargo-clippy", allow(should_implement_trait))] // don't need `Iterator` here
 impl<'a> NamedStatementIterator<'a> {
     pub fn new(stmt: &'a mut Statement) -> QueryResult<Self> {
         let metadata = stmt.metadata()?;

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

@@ -26,7 +26,7 @@ macro_rules! mysql_time_impls {
 
         impl FromSql<$ty, Mysql> for ffi::MYSQL_TIME {
             // ptr::copy_nonoverlapping does not require aligned pointers
-            #[cfg_attr(feature = "clippy", allow(cast_ptr_alignment))]
+            #[cfg_attr(feature = "cargo-clippy", allow(cast_ptr_alignment))]
             fn from_sql(bytes: Option<&[u8]>) -> deserialize::Result<Self> {
                 let bytes = not_none!(bytes);
                 let bytes_ptr = bytes.as_ptr() as *const ffi::MYSQL_TIME;

diesel/src/mysql/types/date_and_time.rs

@@ -136,7 +136,7 @@ impl PgConnection {
         TransactionBuilder::new(self)
     }
 
-    #[cfg_attr(feature = "clippy", allow(type_complexity))]
+    #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))]
     fn prepare_query<T: QueryFragment<Pg> + QueryId>(
         &self,
         source: &T,