Merge pull request #2376 from martell/chore/missing-nightly-update

Many Nightly Fixes
diesel-rs · May 2, 2020 · 968e7f7 · 968e7f7
2 parents a9e6e12 + a19c6e3
commit 968e7f7
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -82,7 +82,7 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-  - rust: nightly-2019-08-01
+  - rust: nightly-2020-05-01
     name: "Compile tests"
     env: RUSTFLAGS="--cap-lints=warn"
     script:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -167,7 +167,7 @@ jobs:
     - template: _build/install-rust.yml
       parameters:
         platform: Linux
-        rust_version: nightly-2020-04-01
+        rust_version: nightly-2020-05-01
     - bash: |
         sudo apt-get update &&
         sudo apt-get -y install libsqlite3-dev libpq-dev libmysqlclient-dev

diff --git a/diesel_compile_tests/rust-toolchain b/diesel_compile_tests/rust-toolchain
@@ -1 +1 @@
-nightly-2020-04-01
+nightly-2020-05-01
diff --git a/diesel_compile_tests/tests/ui/as_changeset_deprecated_column_name.stderr b/diesel_compile_tests/tests/ui/as_changeset_deprecated_column_name.stderr
@@ -10,3 +10,5 @@ warning: The form `column_name(value)` is deprecated. Use `column_name = "value"
 15 |     #[column_name(name)]
    |       ^^^^^^^^^^^^^^^^^
 
+warning: 2 warnings emitted
+
diff --git a/diesel_compile_tests/tests/ui/belongs_to_invalid_option_syntax.stderr b/diesel_compile_tests/tests/ui/belongs_to_invalid_option_syntax.stderr
@@ -48,5 +48,5 @@ to
 35 | #[belongs_to(Baz, foreign_key = "bar_id", random_option)]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 5 previous errors
+error: aborting due to 5 previous errors; 2 warnings emitted
 
diff --git a/diesel_compile_tests/tests/ui/belongs_to_second_parent.stderr b/diesel_compile_tests/tests/ui/belongs_to_second_parent.stderr
@@ -8,3 +8,5 @@ to
 29 | #[belongs_to(Bar, Baz)]
    |   ^^^^^^^^^^^^^^^^^^^^
 
+warning: 1 warning emitted
+
diff --git a/diesel_compile_tests/tests/ui/sql_type_bad_options.stderr b/diesel_compile_tests/tests/ui/sql_type_bad_options.stderr
@@ -46,5 +46,5 @@ error: `postgres` must be in the form `postgres(...)`
 26 | #[postgres = "foo"]
    |   ^^^^^^^^^^^^^^^^
 
-error: aborting due to 5 previous errors
+error: aborting due to 5 previous errors; 3 warnings emitted
 
diff --git a/diesel_derives/src/lib.rs b/diesel_derives/src/lib.rs
@@ -487,7 +487,7 @@ pub fn derive_valid_grouping(input: TokenStream) -> TokenStream {
 ///
 /// The syntax for this macro is very similar to that of a normal Rust function,
 /// except the argument and return types will be the SQL types being used.
-/// Typically these types will come from [`diesel::sql_types`].
+/// Typically these types will come from [`diesel::sql_types`](../diesel/sql_types/index.html)
 ///
 /// This macro will generate two items. A function with the name that you've
 /// given, and a module with a helper type representing the return type of your