Skip to content

Commit 968e7f7

Browse files
authored
Merge pull request diesel-rs#2376 from martell/chore/missing-nightly-update
Many Nightly Fixes
2 parents a9e6e12 + a19c6e3 commit 968e7f7

8 files changed

Lines changed: 10 additions & 6 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ matrix:
8282
allow_failures:
8383
- rust: nightly
8484
include:
85-
- rust: nightly-2019-08-01
85+
- rust: nightly-2020-05-01
8686
name: "Compile tests"
8787
env: RUSTFLAGS="--cap-lints=warn"
8888
script:

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
- template: _build/install-rust.yml
168168
parameters:
169169
platform: Linux
170-
rust_version: nightly-2020-04-01
170+
rust_version: nightly-2020-05-01
171171
- bash: |
172172
sudo apt-get update &&
173173
sudo apt-get -y install libsqlite3-dev libpq-dev libmysqlclient-dev
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2020-04-01
1+
nightly-2020-05-01

diesel_compile_tests/tests/ui/as_changeset_deprecated_column_name.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@ warning: The form `column_name(value)` is deprecated. Use `column_name = "value"
1010
15 | #[column_name(name)]
1111
| ^^^^^^^^^^^^^^^^^
1212

13+
warning: 2 warnings emitted
14+

diesel_compile_tests/tests/ui/belongs_to_invalid_option_syntax.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ to
4848
35 | #[belongs_to(Baz, foreign_key = "bar_id", random_option)]
4949
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5050

51-
error: aborting due to 5 previous errors
51+
error: aborting due to 5 previous errors; 2 warnings emitted
5252

diesel_compile_tests/tests/ui/belongs_to_second_parent.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ to
88
29 | #[belongs_to(Bar, Baz)]
99
| ^^^^^^^^^^^^^^^^^^^^
1010

11+
warning: 1 warning emitted
12+

diesel_compile_tests/tests/ui/sql_type_bad_options.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ error: `postgres` must be in the form `postgres(...)`
4646
26 | #[postgres = "foo"]
4747
| ^^^^^^^^^^^^^^^^
4848

49-
error: aborting due to 5 previous errors
49+
error: aborting due to 5 previous errors; 3 warnings emitted
5050

diesel_derives/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ pub fn derive_valid_grouping(input: TokenStream) -> TokenStream {
487487
///
488488
/// The syntax for this macro is very similar to that of a normal Rust function,
489489
/// except the argument and return types will be the SQL types being used.
490-
/// Typically these types will come from [`diesel::sql_types`].
490+
/// Typically these types will come from [`diesel::sql_types`](../diesel/sql_types/index.html)
491491
///
492492
/// This macro will generate two items. A function with the name that you've
493493
/// given, and a module with a helper type representing the return type of your

0 commit comments

Comments
 (0)