Skip to content

Commit

Permalink
Merge pull request #4237 from weiznich/bump/1.81.0
Browse files Browse the repository at this point in the history 
Bump rust version to 1.81.0
  • Loading branch information
@weiznich
weiznich authored Sep 6, 2024
2 parents f95f06d + 118c6f6 commit 3d4b19d
Show file tree
Hide file tree
Showing 49 changed files with 925 additions and 827 deletions.
56 changes: 28 additions & 28 deletions diesel_compile_tests/tests/fail/aggregate_expression_requires_column_from_same_table.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ error[E0277]: Cannot select `posts::columns::id` from `users::table`
|
= note: `posts::columns::id` is no valid selection for `users::table`
= help: the following other types implement trait `SelectableExpression<QS>`:
<posts::columns::id as SelectableExpression<JoinOn<Join, On>>>
<posts::columns::id as SelectableExpression<Only<posts::table>>>
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
<posts::columns::id as SelectableExpression<Tablesample<posts::table, TSM>>>
<posts::columns::id as SelectableExpression<posts::table>>
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
`posts::columns::id` implements `SelectableExpression<JoinOn<Join, On>>`
`posts::columns::id` implements `SelectableExpression<Only<posts::table>>`
`posts::columns::id` implements `SelectableExpression<SelectStatement<FromClause<From>>>`
`posts::columns::id` implements `SelectableExpression<Tablesample<posts::table, TSM>>`
`posts::columns::id` implements `SelectableExpression<posts::table>`
`posts::columns::id` implements `SelectableExpression<query_source::joins::Join<Left, Right, Inner>>`
`posts::columns::id` implements `SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>`
= note: required for `diesel::expression::functions::aggregate_folding::sum_utils::sum<diesel::sql_types::Integer, posts::columns::id>` to implement `SelectableExpression<users::table>`
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<diesel::expression::functions::aggregate_folding::sum_utils::sum<diesel::sql_types::Integer, posts::columns::id>>`

Expand Down Expand Up @@ -41,13 +41,13 @@ error[E0277]: Cannot select `posts::columns::id` from `users::table`
|
= note: `posts::columns::id` is no valid selection for `users::table`
= help: the following other types implement trait `SelectableExpression<QS>`:
<posts::columns::id as SelectableExpression<JoinOn<Join, On>>>
<posts::columns::id as SelectableExpression<Only<posts::table>>>
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
<posts::columns::id as SelectableExpression<Tablesample<posts::table, TSM>>>
<posts::columns::id as SelectableExpression<posts::table>>
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
`posts::columns::id` implements `SelectableExpression<JoinOn<Join, On>>`
`posts::columns::id` implements `SelectableExpression<Only<posts::table>>`
`posts::columns::id` implements `SelectableExpression<SelectStatement<FromClause<From>>>`
`posts::columns::id` implements `SelectableExpression<Tablesample<posts::table, TSM>>`
`posts::columns::id` implements `SelectableExpression<posts::table>`
`posts::columns::id` implements `SelectableExpression<query_source::joins::Join<Left, Right, Inner>>`
`posts::columns::id` implements `SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>`
= note: required for `diesel::expression::functions::aggregate_folding::avg_utils::avg<diesel::sql_types::Integer, posts::columns::id>` to implement `SelectableExpression<users::table>`
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<diesel::expression::functions::aggregate_folding::avg_utils::avg<diesel::sql_types::Integer, posts::columns::id>>`

Expand Down Expand Up @@ -76,13 +76,13 @@ error[E0277]: Cannot select `posts::columns::id` from `users::table`
|
= note: `posts::columns::id` is no valid selection for `users::table`
= help: the following other types implement trait `SelectableExpression<QS>`:
<posts::columns::id as SelectableExpression<JoinOn<Join, On>>>
<posts::columns::id as SelectableExpression<Only<posts::table>>>
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
<posts::columns::id as SelectableExpression<Tablesample<posts::table, TSM>>>
<posts::columns::id as SelectableExpression<posts::table>>
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
`posts::columns::id` implements `SelectableExpression<JoinOn<Join, On>>`
`posts::columns::id` implements `SelectableExpression<Only<posts::table>>`
`posts::columns::id` implements `SelectableExpression<SelectStatement<FromClause<From>>>`
`posts::columns::id` implements `SelectableExpression<Tablesample<posts::table, TSM>>`
`posts::columns::id` implements `SelectableExpression<posts::table>`
`posts::columns::id` implements `SelectableExpression<query_source::joins::Join<Left, Right, Inner>>`
`posts::columns::id` implements `SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>`
= note: required for `diesel::expression::functions::aggregate_ordering::max_utils::max<diesel::sql_types::Integer, posts::columns::id>` to implement `SelectableExpression<users::table>`
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<diesel::expression::functions::aggregate_ordering::max_utils::max<diesel::sql_types::Integer, posts::columns::id>>`

Expand Down Expand Up @@ -111,13 +111,13 @@ error[E0277]: Cannot select `posts::columns::id` from `users::table`
|
= note: `posts::columns::id` is no valid selection for `users::table`
= help: the following other types implement trait `SelectableExpression<QS>`:
<posts::columns::id as SelectableExpression<JoinOn<Join, On>>>
<posts::columns::id as SelectableExpression<Only<posts::table>>>
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
<posts::columns::id as SelectableExpression<Tablesample<posts::table, TSM>>>
<posts::columns::id as SelectableExpression<posts::table>>
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
`posts::columns::id` implements `SelectableExpression<JoinOn<Join, On>>`
`posts::columns::id` implements `SelectableExpression<Only<posts::table>>`
`posts::columns::id` implements `SelectableExpression<SelectStatement<FromClause<From>>>`
`posts::columns::id` implements `SelectableExpression<Tablesample<posts::table, TSM>>`
`posts::columns::id` implements `SelectableExpression<posts::table>`
`posts::columns::id` implements `SelectableExpression<query_source::joins::Join<Left, Right, Inner>>`
`posts::columns::id` implements `SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>`
= note: required for `diesel::expression::functions::aggregate_ordering::min_utils::min<diesel::sql_types::Integer, posts::columns::id>` to implement `SelectableExpression<users::table>`
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<diesel::expression::functions::aggregate_ordering::min_utils::min<diesel::sql_types::Integer, posts::columns::id>>`

Expand Down
80 changes: 40 additions & 40 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 @@ -8,14 +8,14 @@ error[E0277]: Cannot select `f64` from `NoFromClause`
|
= note: `f64` is no valid selection for `NoFromClause`
= help: the following other types implement trait `SelectableExpression<QS>`:
<&'a T as SelectableExpression<QS>>
<(T0, T1) as SelectableExpression<QS>>
<(T0, T1, T2) as SelectableExpression<QS>>
<(T0, T1, T2, T3) as SelectableExpression<QS>>
<(T0, T1, T2, T3, T4) as SelectableExpression<QS>>
<(T0, T1, T2, T3, T4, T5) as SelectableExpression<QS>>
<(T0, T1, T2, T3, T4, T5, T6) as SelectableExpression<QS>>
<(T0, T1, T2, T3, T4, T5, T6, T7) as SelectableExpression<QS>>
`&'a T` implements `SelectableExpression<QS>`
`(T0, T1)` implements `SelectableExpression<QS>`
`(T0, T1, T2)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3, T4)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3, T4, T5)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3, T4, T5, T6)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3, T4, T5, T6, T7)` implements `SelectableExpression<QS>`
and $N others
= note: required for `(f64, f64)` to implement `SelectableExpression<NoFromClause>`
= note: 1 redundant requirement hidden
Expand Down Expand Up @@ -43,14 +43,14 @@ error[E0277]: the trait bound `f64: ValidGrouping<()>` is not satisfied
| required by a bound introduced by this call
|
= help: the following other types implement trait `ValidGrouping<GroupByClause>`:
<&'a T as ValidGrouping<GB>>
<(T0, T1) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3, T4) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3, T4, T5) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3, T4, T5, T6) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3, T4, T5, T6, T7) as ValidGrouping<__GroupByClause>>
`&'a T` implements `ValidGrouping<GB>`
`(T0, T1)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3, T4)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3, T4, T5)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3, T4, T5, T6)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3, T4, T5, T6, T7)` implements `ValidGrouping<__GroupByClause>`
and $N others
= note: required for `(f64, f64)` to implement `ValidGrouping<()>`
= note: 1 redundant requirement hidden
Expand Down Expand Up @@ -78,14 +78,14 @@ error[E0277]: Cannot select `f64` from `NoFromClause`
|
= note: `f64` is no valid selection for `NoFromClause`
= help: the following other types implement trait `SelectableExpression<QS>`:
<&'a T as SelectableExpression<QS>>
<(T0, T1) as SelectableExpression<QS>>
<(T0, T1, T2) as SelectableExpression<QS>>
<(T0, T1, T2, T3) as SelectableExpression<QS>>
<(T0, T1, T2, T3, T4) as SelectableExpression<QS>>
<(T0, T1, T2, T3, T4, T5) as SelectableExpression<QS>>
<(T0, T1, T2, T3, T4, T5, T6) as SelectableExpression<QS>>
<(T0, T1, T2, T3, T4, T5, T6, T7) as SelectableExpression<QS>>
`&'a T` implements `SelectableExpression<QS>`
`(T0, T1)` implements `SelectableExpression<QS>`
`(T0, T1, T2)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3, T4)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3, T4, T5)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3, T4, T5, T6)` implements `SelectableExpression<QS>`
`(T0, T1, T2, T3, T4, T5, T6, T7)` implements `SelectableExpression<QS>`
and $N others
= note: required for `(f64, f64)` to implement `SelectableExpression<NoFromClause>`
= note: 1 redundant requirement hidden
Expand Down Expand Up @@ -113,14 +113,14 @@ error[E0277]: the trait bound `f64: ValidGrouping<()>` is not satisfied
| required by a bound introduced by this call
|
= help: the following other types implement trait `ValidGrouping<GroupByClause>`:
<&'a T as ValidGrouping<GB>>
<(T0, T1) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3, T4) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3, T4, T5) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3, T4, T5, T6) as ValidGrouping<__GroupByClause>>
<(T0, T1, T2, T3, T4, T5, T6, T7) as ValidGrouping<__GroupByClause>>
`&'a T` implements `ValidGrouping<GB>`
`(T0, T1)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3, T4)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3, T4, T5)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3, T4, T5, T6)` implements `ValidGrouping<__GroupByClause>`
`(T0, T1, T2, T3, T4, T5, T6, T7)` implements `ValidGrouping<__GroupByClause>`
and $N others
= note: required for `(f64, f64)` to implement `ValidGrouping<()>`
= note: 1 redundant requirement hidden
Expand Down Expand Up @@ -182,14 +182,14 @@ error[E0277]: `f64` is no valid SQL fragment for the `Pg` backend
= note: this usually means that the `Pg` database system does not support
this SQL syntax
= help: the following other types implement trait `QueryFragment<DB, SP>`:
<&'a T as QueryFragment<DB>>
<() as QueryFragment<DB>>
<(T0, T1) as QueryFragment<__DB>>
<(T0, T1, T2) as QueryFragment<__DB>>
<(T0, T1, T2, T3) as QueryFragment<__DB>>
<(T0, T1, T2, T3, T4) as QueryFragment<__DB>>
<(T0, T1, T2, T3, T4, T5) as QueryFragment<__DB>>
<(T0, T1, T2, T3, T4, T5, T6) as QueryFragment<__DB>>
`&'a T` implements `QueryFragment<DB>`
`()` implements `QueryFragment<DB>`
`(T0, T1)` implements `QueryFragment<__DB>`
`(T0, T1, T2)` implements `QueryFragment<__DB>`
`(T0, T1, T2, T3)` implements `QueryFragment<__DB>`
`(T0, T1, T2, T3, T4)` implements `QueryFragment<__DB>`
`(T0, T1, T2, T3, T4, T5)` implements `QueryFragment<__DB>`
`(T0, T1, T2, T3, T4, T5, T6)` implements `QueryFragment<__DB>`
and $N others
= note: required for `(f64, f64)` to implement `QueryFragment<Pg>`
= note: 4 redundant requirements hidden
Expand Down
Loading

0 comments on commit 3d4b19d

Please sign in to comment.