Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Many Nightly Fixes #2376

Merged
merged 4 commits into from
May 2, 2020
Merged

Many Nightly Fixes #2376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8b6042
Update nightly in travis to match rust-toolchain
martell Apr 24, 2020
c05e062
Fix intra doc link to diesel::sql_types
martell Apr 24, 2020
9d05d0e
Update to a nightly that has clippy and rustfmt
martell Apr 25, 2020
a19c6e3
Update nightly for unused_braces regression
martell May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion diesel_compile_tests/rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2020-04-01
nightly-2020-05-01
2 changes: 2 additions & 0 deletions diesel_compile_tests/tests/ui/as_changeset_deprecated_column_name.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ warning: The form `column_name(value)` is deprecated. Use `column_name = "value"
15 | #[column_name(name)]
| ^^^^^^^^^^^^^^^^^

warning: 2 warnings emitted

2 changes: 1 addition & 1 deletion diesel_compile_tests/tests/ui/belongs_to_invalid_option_syntax.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 2 additions & 0 deletions diesel_compile_tests/tests/ui/belongs_to_second_parent.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ to
29 | #[belongs_to(Bar, Baz)]
| ^^^^^^^^^^^^^^^^^^^^

warning: 1 warning emitted

2 changes: 1 addition & 1 deletion diesel_compile_tests/tests/ui/sql_type_bad_options.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion diesel_derives/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down