Skip to content

Commit

Permalink
Bump toolchain to 1.82
Browse files Browse the repository at this point in the history
  • Loading branch information
@weiznich
weiznich committed Oct 18, 2024
1 parent 77ca1a3 commit d5be70c
Show file tree
Hide file tree
Showing 60 changed files with 868 additions and 492 deletions.
50 changes: 25 additions & 25 deletions diesel_compile_tests/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion diesel_compile_tests/tests/fail/alias_and_group_by.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ note: required for `columns::id` to implement `ValidGrouping<columns::name>`
= note: associated types for the current `impl` cannot be restricted in `where` clauses
= note: 1 redundant requirement hidden
= note: required for `AliasedField<user1, columns::id>` to implement `ValidGrouping<AliasedField<user1, columns::name>>`
= note: required for `SelectStatement<FromClause<Alias<user1>>, diesel::query_builder::select_clause::DefaultSelectClause<FromClause<Alias<user1>>>, diesel::query_builder::distinct_clause::NoDistinctClause, diesel::query_builder::where_clause::NoWhereClause, diesel::query_builder::order_clause::NoOrderClause, LimitOffsetClause<NoLimitClause, NoOffsetClause>, diesel::query_builder::group_by_clause::GroupByClause<AliasedField<user1, columns::name>>>` to implement `SelectDsl<AliasedField<user1, columns::id>>`
= note: required for `SelectStatement<FromClause<Alias<user1>>, DefaultSelectClause<FromClause<...>>, ..., ..., ..., ..., ...>` to implement `SelectDsl<AliasedField<user1, columns::id>>`
= note: consider using `--verbose` to print the full type name to the console
12 changes: 8 additions & 4 deletions diesel_compile_tests/tests/fail/any_is_only_selectable_if_inner_expr_is_selectable.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ note: required for `more_stuff::columns::names` to implement `AppearsOnTable<stu
| ^^^^^
= note: associated types for the current `impl` cannot be restricted in `where` clauses
= note: 3 redundant requirements hidden
= note: required for `diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<stuff::columns::name, diesel::pg::expression::array_comparison::Any<more_stuff::columns::names>>>` to implement `AppearsOnTable<stuff::table>`
= note: required for `diesel::query_builder::where_clause::WhereClause<diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<stuff::columns::name, diesel::pg::expression::array_comparison::Any<more_stuff::columns::names>>>>` to implement `diesel::query_builder::where_clause::ValidWhereClause<FromClause<stuff::table>>`
= note: required for `SelectStatement<FromClause<stuff::table>, diesel::query_builder::select_clause::DefaultSelectClause<FromClause<stuff::table>>, diesel::query_builder::distinct_clause::NoDistinctClause, diesel::query_builder::where_clause::WhereClause<diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<stuff::columns::name, diesel::pg::expression::array_comparison::Any<more_stuff::columns::names>>>>>` to implement `Query`
= note: required for `SelectStatement<FromClause<stuff::table>, diesel::query_builder::select_clause::DefaultSelectClause<FromClause<stuff::table>>, diesel::query_builder::distinct_clause::NoDistinctClause, diesel::query_builder::where_clause::WhereClause<diesel::expression::grouped::Grouped<diesel::expression::operators::Eq<stuff::columns::name, diesel::pg::expression::array_comparison::Any<more_stuff::columns::names>>>>>` to implement `LoadQuery<'_, _, _>`
= note: required for `Grouped<Eq<name, Any<names>>>` to implement `AppearsOnTable<stuff::table>`
= note: required for `WhereClause<Grouped<Eq<name, Any<names>>>>` to implement `diesel::query_builder::where_clause::ValidWhereClause<FromClause<stuff::table>>`
= note: required for `SelectStatement<FromClause<table>, DefaultSelectClause<FromClause<table>>, NoDistinctClause, WhereClause<...>>` to implement `Query`
= note: required for `SelectStatement<FromClause<table>, DefaultSelectClause<FromClause<table>>, NoDistinctClause, WhereClause<...>>` to implement `LoadQuery<'_, _, _>`
note: required by a bound in `diesel::RunQueryDsl::load`
--> $DIESEL/src/query_dsl/mod.rs
|
Expand All @@ -33,3 +33,7 @@ note: required by a bound in `diesel::RunQueryDsl::load`
| where
| Self: LoadQuery<'query, Conn, U>,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `RunQueryDsl::load`
= note: consider using `--verbose` to print the full type name to the console
= note: consider using `--verbose` to print the full type name to the console
= note: consider using `--verbose` to print the full type name to the console
= note: consider using `--verbose` to print the full type name to the console
36 changes: 24 additions & 12 deletions diesel_compile_tests/tests/fail/array_expressions_must_be_correct_type.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ error[E0277]: Cannot select `f64` from `NoFromClause`
= note: 1 redundant requirement hidden
= note: required for `diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>` to implement `SelectableExpression<NoFromClause>`
= note: required for `diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>` to implement `diesel::query_builder::select_clause::SelectClauseExpression<NoFromClause>`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `Query`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `AsQuery`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `Query`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `AsQuery`
note: required by a bound in `diesel::select`
--> $DIESEL/src/query_builder/functions.rs
|
Expand All @@ -31,6 +31,8 @@ note: required by a bound in `diesel::select`
...
| crate::dsl::select<T>: AsQuery,
| ^^^^^^^ required by this bound in `select`
= note: consider using `--verbose` to print the full type name to the console
= note: consider using `--verbose` to print the full type name to the console

error[E0277]: the trait bound `f64: ValidGrouping<()>` is not satisfied
--> tests/fail/array_expressions_must_be_correct_type.rs:9:12
Expand All @@ -53,8 +55,8 @@ error[E0277]: the trait bound `f64: ValidGrouping<()>` is not satisfied
= note: required for `(f64, f64)` to implement `ValidGrouping<()>`
= note: 1 redundant requirement hidden
= note: required for `diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>` to implement `ValidGrouping<()>`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `Query`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `AsQuery`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `Query`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `AsQuery`
note: required by a bound in `diesel::select`
--> $DIESEL/src/query_builder/functions.rs
|
Expand All @@ -63,6 +65,8 @@ note: required by a bound in `diesel::select`
...
| crate::dsl::select<T>: AsQuery,
| ^^^^^^^ required by this bound in `select`
= note: consider using `--verbose` to print the full type name to the console
= note: consider using `--verbose` to print the full type name to the console

error[E0277]: Cannot select `f64` from `NoFromClause`
--> tests/fail/array_expressions_must_be_correct_type.rs:9:56
Expand All @@ -87,8 +91,8 @@ error[E0277]: Cannot select `f64` from `NoFromClause`
= note: 1 redundant requirement hidden
= note: required for `diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>` to implement `SelectableExpression<NoFromClause>`
= note: required for `diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>` to implement `diesel::query_builder::select_clause::SelectClauseExpression<NoFromClause>`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `Query`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `LoadQuery<'_, _, Vec<i32>>`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `Query`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `LoadQuery<'_, _, Vec<i32>>`
note: required by a bound in `get_result`
--> $DIESEL/src/query_dsl/mod.rs
|
Expand All @@ -97,6 +101,8 @@ note: required by a bound in `get_result`
| where
| Self: LoadQuery<'query, Conn, U>,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `RunQueryDsl::get_result`
= note: consider using `--verbose` to print the full type name to the console
= note: consider using `--verbose` to print the full type name to the console

error[E0277]: the trait bound `f64: ValidGrouping<()>` is not satisfied
--> tests/fail/array_expressions_must_be_correct_type.rs:9:56
Expand All @@ -119,8 +125,8 @@ error[E0277]: the trait bound `f64: ValidGrouping<()>` is not satisfied
= note: required for `(f64, f64)` to implement `ValidGrouping<()>`
= note: 1 redundant requirement hidden
= note: required for `diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>` to implement `ValidGrouping<()>`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `Query`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `LoadQuery<'_, _, Vec<i32>>`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `Query`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `LoadQuery<'_, _, Vec<i32>>`
note: required by a bound in `get_result`
--> $DIESEL/src/query_dsl/mod.rs
|
Expand All @@ -129,6 +135,8 @@ note: required by a bound in `get_result`
| where
| Self: LoadQuery<'query, Conn, U>,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `RunQueryDsl::get_result`
= note: consider using `--verbose` to print the full type name to the console
= note: consider using `--verbose` to print the full type name to the console

error[E0277]: the trait bound `f64: QueryId` is not satisfied
--> tests/fail/array_expressions_must_be_correct_type.rs:9:56
Expand All @@ -150,8 +158,8 @@ error[E0277]: the trait bound `f64: QueryId` is not satisfied
and $N others
= note: required for `(f64, f64)` to implement `QueryId`
= note: 3 redundant requirements hidden
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `QueryId`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `LoadQuery<'_, _, Vec<i32>>`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `QueryId`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `LoadQuery<'_, _, Vec<i32>>`
note: required by a bound in `get_result`
--> $DIESEL/src/query_dsl/mod.rs
|
Expand All @@ -160,6 +168,8 @@ note: required by a bound in `get_result`
| where
| Self: LoadQuery<'query, Conn, U>,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `RunQueryDsl::get_result`
= note: consider using `--verbose` to print the full type name to the console
= note: consider using `--verbose` to print the full type name to the console

error[E0277]: `f64` is no valid SQL fragment for the `Pg` backend
--> tests/fail/array_expressions_must_be_correct_type.rs:9:56
Expand All @@ -183,8 +193,8 @@ error[E0277]: `f64` is no valid SQL fragment for the `Pg` backend
and $N others
= note: required for `(f64, f64)` to implement `QueryFragment<Pg>`
= note: 4 redundant requirements hidden
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `QueryFragment<Pg>`
= note: required for `SelectStatement<NoFromClause, diesel::query_builder::select_clause::SelectClause<diesel::pg::expression::array::ArrayLiteral<(f64, f64), diesel::sql_types::Integer>>>` to implement `LoadQuery<'_, _, Vec<i32>>`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `QueryFragment<Pg>`
= note: required for `SelectStatement<NoFromClause, SelectClause<ArrayLiteral<(f64, f64), Integer>>>` to implement `LoadQuery<'_, _, Vec<i32>>`
note: required by a bound in `get_result`
--> $DIESEL/src/query_dsl/mod.rs
|
Expand All @@ -193,6 +203,8 @@ note: required by a bound in `get_result`
| where
| Self: LoadQuery<'query, Conn, U>,
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `RunQueryDsl::get_result`
= note: consider using `--verbose` to print the full type name to the console
= note: consider using `--verbose` to print the full type name to the console

error[E0277]: the trait bound `f64: diesel::Expression` is not satisfied
--> tests/fail/array_expressions_must_be_correct_type.rs:9:19
Expand Down
Loading

0 comments on commit d5be70c

Please sign in to comment.