Update to nightly-2018-07-17 #1789

sgrif · 2018-07-18T19:59:22Z

I would have preferred to do this in smaller pieces, but unfortunately
we had to do this all in one go. Clippy is no longer publishing to
crates.io, so we have to switch to using cargo clippy. There are also
a few bugs in recent versions that we have to work around.

The version of proc-macro that we were using no longer compiles on the
most recent nightlies, so we had to bump that as well (and therefore
also bump our version of syn). The biggest change here is that
syn::Ident is now proc_macro2::Ident, which does not implement
From<&str>, AsRef<str>, or Copy.

Finally, our UI tests regressed significantly, as Rust is no longer
giving us any useable span information for any piece of attributes in
derive macros. There's nothing we can do to work around this, we'll just
have to wait for Rust to fix it on their end.

I would have preferred to do this in smaller pieces, but unfortunately we had to do this all in one go. Clippy is no longer publishing to crates.io, so we have to switch to using `cargo clippy`. There are also a few bugs in recent versions that we have to work around. The version of proc-macro that we were using no longer compiles on the most recent nightlies, so we had to bump that as well (and therefore also bump our version of `syn`). The biggest change here is that `syn::Ident` is now `proc_macro2::Ident`, which does not implement `From<&str>`, `AsRef<str>`, or `Copy`. Finally, our UI tests regressed significantly, as Rust is no longer giving us any useable span information for any piece of attributes in derive macros. There's nothing we can do to work around this, we'll just have to wait for Rust to fix it on their end.

Eijebong

Apart from the dummy mod question, this looks good to me.

Eijebong · 2018-07-18T20:04:06Z

diesel/src/connection/statement_cache.rs

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


I guess this is set by clippy when you run it ?

Eijebong · 2018-07-18T20:04:57Z

diesel_cli/src/infer_schema_internals/foreign_keys.rs

@@ -1,3 +1,5 @@
+#![cfg_attr(feature = "cargo-clippy", allow(expect_fun_call))] // My calls are so fun


Eijebong · 2018-07-18T20:11:42Z

diesel_derives/src/queryable_by_name.rs

@@ -78,8 +78,8 @@ fn sql_type(field: &Field, model: &Model) -> syn::Type {
            parse_quote!(diesel::dsl::SqlTypeOf<#table_name::#column_name>)
        } else {
            let field_name = match field.name {
-                FieldName::Named(ref x) => x.as_ref(),


This could also be to_string instead of creating another Ident. That would make it clearer that it's not going to be used in a quote! call.

Eijebong · 2018-07-18T20:12:49Z

diesel_derives/src/util.rs

    quote! {
        #[allow(non_snake_case, unused_extern_crates, unused_imports)]
-        mod #const_name {


Hu ? This isn't a dummy mod then

Sure -- Just didn't really feel like churning every call. Probably should have named it dummy_scope or something since we've now changed it from const to mod to fn

Eijebong · 2018-07-18T20:13:11Z

diesel_derives/src/util.rs

    let bad_span_debug = "#0 bytes(0..0)";
+
+    if format!("{:?}", fallback) == bad_span_debug {
+        // On recent rust nightlies, even our fallback span is bad.


nabijaczleweli · 2018-07-18T21:14:54Z

Does this also fix the docs not building on latest nightly?

sgrif · 2018-07-18T21:18:39Z

I have no idea. We build our docs on stable.

nabijaczleweli · 2018-07-18T21:21:59Z

Well, FTR, this is what the error looks like (can you cfg() on is-doc?, seems like simplest solution).

sgrif · 2018-07-18T21:24:14Z

You're using 0.16.0, which hasn't been supported for nearly a year

nabijaczleweli · 2018-07-18T21:38:02Z

Whoops! I based this project off an another, older one, and there seemed to not be any kind of (migration, deprecation?) notice on diesel_codegen, so I matched diesel version to diesel_codegen's. Will explore that.

However, the error still occurs on latest diesel (CI link):

note: lint level defined here
   --> D:\Users\nabijaczleweli\.cargo\registry\src\github.com-1ecc6299db9ec823\diesel-1.3.2\src\lib.rs:131:9
    |
131 | #![deny(warnings, missing_debug_implementations, missing_copy_implementations, missing_docs)]
    |         ^^^^^^^^
    = note: #[deny(intra_doc_link_resolution_failure)] implied by #[deny(warnings)]
    = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]`

killercup · 2018-07-19T08:33:55Z

diesel/src/connection/statement_cache.rs

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


nabijaczleweli · 2018-07-19T13:17:56Z

Okay, so I've the simple solution for the aforementioned problem; that is to change srd/lib.rs#L131 to:

#![cfg_attr(feature = "dox", deny(warnings, missing_debug_implementations, missing_copy_implementations, missing_docs))]

This will only disallow warnings on non-doc builds, meaning that docs, while still warninging like hell (I'll probably PR that), do actually build.

sgrif requested a review from a team July 18, 2018 19:59

rustfmt

55e3894

Eijebong approved these changes Jul 18, 2018

View reviewed changes

This was referenced Jul 19, 2018

Update nightly version to 2018-06-20 #1765

Closed

update deps #1742

Closed

killercup approved these changes Jul 19, 2018

View reviewed changes

sgrif merged commit 765b782 into master Jul 19, 2018

sgrif deleted the sg-bump-nightly branch July 19, 2018 13:51

nabijaczleweli mentioned this pull request Jul 19, 2018

Documentation does not build on Rust 1.29.0 #1792

Closed

2 tasks

weiznich mentioned this pull request Sep 20, 2018

Use cargo clippy instead of the clippy plugin #1709

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to nightly-2018-07-17 #1789

Update to nightly-2018-07-17 #1789

sgrif commented Jul 18, 2018

Eijebong left a comment

Eijebong Jul 18, 2018

killercup Jul 19, 2018

Eijebong Jul 18, 2018

Eijebong Jul 18, 2018

Eijebong Jul 18, 2018

sgrif Jul 18, 2018

Eijebong Jul 18, 2018

nabijaczleweli commented Jul 18, 2018

sgrif commented Jul 18, 2018

nabijaczleweli commented Jul 18, 2018

sgrif commented Jul 18, 2018

nabijaczleweli commented Jul 18, 2018 •

edited

Loading

killercup Jul 19, 2018

nabijaczleweli commented Jul 19, 2018 •

edited

Loading

		@@ -1,3 +1,5 @@
		#![cfg_attr(feature = "cargo-clippy", allow(expect_fun_call))] // My calls are so fun

Update to nightly-2018-07-17 #1789

Update to nightly-2018-07-17 #1789

Conversation

sgrif commented Jul 18, 2018

Eijebong left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nabijaczleweli commented Jul 18, 2018

sgrif commented Jul 18, 2018

nabijaczleweli commented Jul 18, 2018

sgrif commented Jul 18, 2018

nabijaczleweli commented Jul 18, 2018 • edited Loading

Choose a reason for hiding this comment

nabijaczleweli commented Jul 19, 2018 • edited Loading

nabijaczleweli commented Jul 18, 2018 •

edited

Loading

nabijaczleweli commented Jul 19, 2018 •

edited

Loading