Skip to content

Commit a0ef12f

Browse files
weiznichweiznich
committed
Merge pull request #4072 from weiznich/bump/1.79
Bump repository toolchain to 1.79
1 parent 8bd2743 commit a0ef12f

File tree

50 files changed

+745
-759
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+745
-759
lines changed

‎diesel/src/mysql/types/primitives.rs

-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ where
2323
}
2424

2525
fn f32_to_i64(f: f32) -> deserialize::Result<i64> {
26-
use std::i64;
27-
2826
if f <= i64::MAX as f32 && f >= i64::MIN as f32 {
2927
Ok(f.trunc() as i64)
3028
} else {
@@ -35,8 +33,6 @@ fn f32_to_i64(f: f32) -> deserialize::Result<i64> {
3533
}
3634

3735
fn f64_to_i64(f: f64) -> deserialize::Result<i64> {
38-
use std::i64;
39-
4036
if f <= i64::MAX as f64 && f >= i64::MIN as f64 {
4137
Ok(f.trunc() as i64)
4238
} else {

‎diesel/src/pg/types/money.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ fn add_assign_money() {
117117
#[test]
118118
#[should_panic(expected = "overflow adding money amounts")]
119119
fn add_money_overflow() {
120-
let c1 = PgMoney(::std::i64::MAX);
120+
let c1 = PgMoney(i64::MAX);
121121
let c2 = PgMoney(1);
122122
let _overflow = c1 + c2;
123123
}
124124

125125
#[test]
126126
#[should_panic(expected = "overflow adding money amounts")]
127127
fn add_assign_money_overflow() {
128-
let mut c1 = PgMoney(::std::i64::MAX);
128+
let mut c1 = PgMoney(i64::MAX);
129129
c1 += PgMoney(1);
130130
}
131131

@@ -146,14 +146,14 @@ fn sub_assign_money() {
146146
#[test]
147147
#[should_panic(expected = "underflow subtracting money amounts")]
148148
fn sub_money_underflow() {
149-
let c1 = PgMoney(::std::i64::MIN);
149+
let c1 = PgMoney(i64::MIN);
150150
let c2 = PgMoney(1);
151151
let _underflow = c1 - c2;
152152
}
153153

154154
#[test]
155155
#[should_panic(expected = "underflow subtracting money amounts")]
156156
fn sub_assign_money_underflow() {
157-
let mut c1 = PgMoney(::std::i64::MIN);
157+
let mut c1 = PgMoney(i64::MIN);
158158
c1 -= PgMoney(1);
159159
}

‎diesel_compile_tests/tests/fail/aggregate_expression_requires_column_from_same_table.stderr

+16-16
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ error[E0277]: Cannot select `posts::columns::id` from `users::table`
66
|
77
= note: `posts::columns::id` is no valid selection for `users::table`
88
= help: the following other types implement trait `SelectableExpression<QS>`:
9-
<posts::columns::id as SelectableExpression<posts::table>>
10-
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
11-
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
12-
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
139
<posts::columns::id as SelectableExpression<JoinOn<Join, On>>>
1410
<posts::columns::id as SelectableExpression<Only<posts::table>>>
11+
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
1512
<posts::columns::id as SelectableExpression<Tablesample<posts::table, TSM>>>
13+
<posts::columns::id as SelectableExpression<posts::table>>
14+
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
15+
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
1616
= note: required for `diesel::expression::functions::aggregate_folding::sum_utils::sum<diesel::sql_types::Integer, posts::columns::id>` to implement `SelectableExpression<users::table>`
1717
= 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>>`
1818

@@ -41,13 +41,13 @@ error[E0277]: Cannot select `posts::columns::id` from `users::table`
4141
|
4242
= note: `posts::columns::id` is no valid selection for `users::table`
4343
= help: the following other types implement trait `SelectableExpression<QS>`:
44-
<posts::columns::id as SelectableExpression<posts::table>>
45-
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
46-
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
47-
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
4844
<posts::columns::id as SelectableExpression<JoinOn<Join, On>>>
4945
<posts::columns::id as SelectableExpression<Only<posts::table>>>
46+
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
5047
<posts::columns::id as SelectableExpression<Tablesample<posts::table, TSM>>>
48+
<posts::columns::id as SelectableExpression<posts::table>>
49+
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
50+
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
5151
= note: required for `diesel::expression::functions::aggregate_folding::avg_utils::avg<diesel::sql_types::Integer, posts::columns::id>` to implement `SelectableExpression<users::table>`
5252
= 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>>`
5353

@@ -76,13 +76,13 @@ error[E0277]: Cannot select `posts::columns::id` from `users::table`
7676
|
7777
= note: `posts::columns::id` is no valid selection for `users::table`
7878
= help: the following other types implement trait `SelectableExpression<QS>`:
79-
<posts::columns::id as SelectableExpression<posts::table>>
80-
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
81-
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
82-
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
8379
<posts::columns::id as SelectableExpression<JoinOn<Join, On>>>
8480
<posts::columns::id as SelectableExpression<Only<posts::table>>>
81+
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
8582
<posts::columns::id as SelectableExpression<Tablesample<posts::table, TSM>>>
83+
<posts::columns::id as SelectableExpression<posts::table>>
84+
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
85+
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
8686
= note: required for `diesel::expression::functions::aggregate_ordering::max_utils::max<diesel::sql_types::Integer, posts::columns::id>` to implement `SelectableExpression<users::table>`
8787
= 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>>`
8888

@@ -111,13 +111,13 @@ error[E0277]: Cannot select `posts::columns::id` from `users::table`
111111
|
112112
= note: `posts::columns::id` is no valid selection for `users::table`
113113
= help: the following other types implement trait `SelectableExpression<QS>`:
114-
<posts::columns::id as SelectableExpression<posts::table>>
115-
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
116-
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
117-
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
118114
<posts::columns::id as SelectableExpression<JoinOn<Join, On>>>
119115
<posts::columns::id as SelectableExpression<Only<posts::table>>>
116+
<posts::columns::id as SelectableExpression<SelectStatement<FromClause<From>>>>
120117
<posts::columns::id as SelectableExpression<Tablesample<posts::table, TSM>>>
118+
<posts::columns::id as SelectableExpression<posts::table>>
119+
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, Inner>>>
120+
<posts::columns::id as SelectableExpression<query_source::joins::Join<Left, Right, LeftOuter>>>
121121
= note: required for `diesel::expression::functions::aggregate_ordering::min_utils::min<diesel::sql_types::Integer, posts::columns::id>` to implement `SelectableExpression<users::table>`
122122
= 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>>`
123123

‎diesel_compile_tests/tests/fail/array_expressions_must_be_correct_type.stderr

+56-56
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ error[E0277]: Cannot select `f64` from `NoFromClause`
88
|
99
= note: `f64` is no valid selection for `NoFromClause`
1010
= help: the following other types implement trait `SelectableExpression<QS>`:
11-
<Box<T> as SelectableExpression<QS>>
12-
<diesel::expression::ops::numeric::Add<Lhs, Rhs> as SelectableExpression<QS>>
13-
<diesel::expression::ops::numeric::Sub<Lhs, Rhs> as SelectableExpression<QS>>
14-
<diesel::expression::ops::numeric::Mul<Lhs, Rhs> as SelectableExpression<QS>>
15-
<diesel::expression::ops::numeric::Div<Lhs, Rhs> as SelectableExpression<QS>>
16-
<now as SelectableExpression<QS>>
17-
<today as SelectableExpression<QS>>
18-
<In<T, U> as SelectableExpression<QS>>
11+
<&'a T as SelectableExpression<QS>>
12+
<(T0, T1) as SelectableExpression<QS>>
13+
<(T0, T1, T2) as SelectableExpression<QS>>
14+
<(T0, T1, T2, T3) as SelectableExpression<QS>>
15+
<(T0, T1, T2, T3, T4) as SelectableExpression<QS>>
16+
<(T0, T1, T2, T3, T4, T5) as SelectableExpression<QS>>
17+
<(T0, T1, T2, T3, T4, T5, T6) as SelectableExpression<QS>>
18+
<(T0, T1, T2, T3, T4, T5, T6, T7) as SelectableExpression<QS>>
1919
and $N others
2020
= note: required for `(f64, f64)` to implement `SelectableExpression<NoFromClause>`
2121
= note: 1 redundant requirement hidden
@@ -43,14 +43,14 @@ error[E0277]: the trait bound `f64: ValidGrouping<()>` is not satisfied
4343
| required by a bound introduced by this call
4444
|
4545
= help: the following other types implement trait `ValidGrouping<GroupByClause>`:
46-
<Box<T> as ValidGrouping<GB>>
47-
<diesel::expression::ops::numeric::Add<Lhs, Rhs> as ValidGrouping<__GroupByClause>>
48-
<diesel::expression::ops::numeric::Sub<Lhs, Rhs> as ValidGrouping<__GroupByClause>>
49-
<diesel::expression::ops::numeric::Mul<Lhs, Rhs> as ValidGrouping<__GroupByClause>>
50-
<diesel::expression::ops::numeric::Div<Lhs, Rhs> as ValidGrouping<__GroupByClause>>
51-
<now as ValidGrouping<__GroupByClause>>
52-
<today as ValidGrouping<__GroupByClause>>
53-
<In<T, U> as ValidGrouping<__GroupByClause>>
46+
<&'a T as ValidGrouping<GB>>
47+
<(T0, T1) as ValidGrouping<__GroupByClause>>
48+
<(T0, T1, T2) as ValidGrouping<__GroupByClause>>
49+
<(T0, T1, T2, T3) as ValidGrouping<__GroupByClause>>
50+
<(T0, T1, T2, T3, T4) as ValidGrouping<__GroupByClause>>
51+
<(T0, T1, T2, T3, T4, T5) as ValidGrouping<__GroupByClause>>
52+
<(T0, T1, T2, T3, T4, T5, T6) as ValidGrouping<__GroupByClause>>
53+
<(T0, T1, T2, T3, T4, T5, T6, T7) as ValidGrouping<__GroupByClause>>
5454
and $N others
5555
= note: required for `(f64, f64)` to implement `ValidGrouping<()>`
5656
= note: 1 redundant requirement hidden
@@ -78,14 +78,14 @@ error[E0277]: Cannot select `f64` from `NoFromClause`
7878
|
7979
= note: `f64` is no valid selection for `NoFromClause`
8080
= help: the following other types implement trait `SelectableExpression<QS>`:
81-
<Box<T> as SelectableExpression<QS>>
82-
<diesel::expression::ops::numeric::Add<Lhs, Rhs> as SelectableExpression<QS>>
83-
<diesel::expression::ops::numeric::Sub<Lhs, Rhs> as SelectableExpression<QS>>
84-
<diesel::expression::ops::numeric::Mul<Lhs, Rhs> as SelectableExpression<QS>>
85-
<diesel::expression::ops::numeric::Div<Lhs, Rhs> as SelectableExpression<QS>>
86-
<now as SelectableExpression<QS>>
87-
<today as SelectableExpression<QS>>
88-
<In<T, U> as SelectableExpression<QS>>
81+
<&'a T as SelectableExpression<QS>>
82+
<(T0, T1) as SelectableExpression<QS>>
83+
<(T0, T1, T2) as SelectableExpression<QS>>
84+
<(T0, T1, T2, T3) as SelectableExpression<QS>>
85+
<(T0, T1, T2, T3, T4) as SelectableExpression<QS>>
86+
<(T0, T1, T2, T3, T4, T5) as SelectableExpression<QS>>
87+
<(T0, T1, T2, T3, T4, T5, T6) as SelectableExpression<QS>>
88+
<(T0, T1, T2, T3, T4, T5, T6, T7) as SelectableExpression<QS>>
8989
and $N others
9090
= note: required for `(f64, f64)` to implement `SelectableExpression<NoFromClause>`
9191
= note: 1 redundant requirement hidden
@@ -113,14 +113,14 @@ error[E0277]: the trait bound `f64: ValidGrouping<()>` is not satisfied
113113
| required by a bound introduced by this call
114114
|
115115
= help: the following other types implement trait `ValidGrouping<GroupByClause>`:
116-
<Box<T> as ValidGrouping<GB>>
117-
<diesel::expression::ops::numeric::Add<Lhs, Rhs> as ValidGrouping<__GroupByClause>>
118-
<diesel::expression::ops::numeric::Sub<Lhs, Rhs> as ValidGrouping<__GroupByClause>>
119-
<diesel::expression::ops::numeric::Mul<Lhs, Rhs> as ValidGrouping<__GroupByClause>>
120-
<diesel::expression::ops::numeric::Div<Lhs, Rhs> as ValidGrouping<__GroupByClause>>
121-
<now as ValidGrouping<__GroupByClause>>
122-
<today as ValidGrouping<__GroupByClause>>
123-
<In<T, U> as ValidGrouping<__GroupByClause>>
116+
<&'a T as ValidGrouping<GB>>
117+
<(T0, T1) as ValidGrouping<__GroupByClause>>
118+
<(T0, T1, T2) as ValidGrouping<__GroupByClause>>
119+
<(T0, T1, T2, T3) as ValidGrouping<__GroupByClause>>
120+
<(T0, T1, T2, T3, T4) as ValidGrouping<__GroupByClause>>
121+
<(T0, T1, T2, T3, T4, T5) as ValidGrouping<__GroupByClause>>
122+
<(T0, T1, T2, T3, T4, T5, T6) as ValidGrouping<__GroupByClause>>
123+
<(T0, T1, T2, T3, T4, T5, T6, T7) as ValidGrouping<__GroupByClause>>
124124
and $N others
125125
= note: required for `(f64, f64)` to implement `ValidGrouping<()>`
126126
= note: 1 redundant requirement hidden
@@ -147,14 +147,14 @@ error[E0277]: the trait bound `f64: QueryId` is not satisfied
147147
| required by a bound introduced by this call
148148
|
149149
= help: the following other types implement trait `QueryId`:
150-
Box<T>
151-
DeleteStatement<T, U, Ret>
152-
FromClause<F>
153-
diesel::query_builder::insert_statement::insert_with_default_for_sqlite::SqliteBatchInsertWrapper<V, T, QId, STATIC_QUERY_ID>
154-
diesel::query_builder::select_clause::DefaultSelectClause<QS>
155-
BoxedSqlQuery<'_, DB, Query>
156-
diesel::query_builder::where_clause::BoxedWhereClause<'a, DB>
157-
query_source::joins::Join<Left, Right, Kind>
150+
&'a T
151+
()
152+
(T0, T1)
153+
(T0, T1, T2)
154+
(T0, T1, T2, T3)
155+
(T0, T1, T2, T3, T4)
156+
(T0, T1, T2, T3, T4, T5)
157+
(T0, T1, T2, T3, T4, T5, T6)
158158
and $N others
159159
= note: required for `(f64, f64)` to implement `QueryId`
160160
= note: 3 redundant requirements hidden
@@ -182,14 +182,14 @@ error[E0277]: `f64` is no valid SQL fragment for the `Pg` backend
182182
= note: this usually means that the `Pg` database system does not support
183183
this SQL syntax
184184
= help: the following other types implement trait `QueryFragment<DB, SP>`:
185-
<Box<T> as QueryFragment<DB>>
186-
<DeleteStatement<T, U, Ret> as QueryFragment<DB>>
187-
<FromClause<F> as QueryFragment<DB>>
188-
<diesel::query_builder::insert_statement::insert_with_default_for_sqlite::SqliteBatchInsertWrapper<Vec<diesel::query_builder::insert_statement::ValuesClause<V, Tab>>, Tab, QId, STATIC_QUERY_ID> as QueryFragment<Sqlite>>
189-
<BoxedLimitOffsetClause<'a, Mysql> as QueryFragment<Mysql>>
190-
<BoxedLimitOffsetClause<'a, Pg> as QueryFragment<Pg>>
191-
<BoxedLimitOffsetClause<'a, Sqlite> as QueryFragment<Sqlite>>
192-
<diesel::query_builder::select_clause::DefaultSelectClause<QS> as QueryFragment<DB>>
185+
<&'a T as QueryFragment<DB>>
186+
<() as QueryFragment<DB>>
187+
<(T0, T1) as QueryFragment<__DB>>
188+
<(T0, T1, T2) as QueryFragment<__DB>>
189+
<(T0, T1, T2, T3) as QueryFragment<__DB>>
190+
<(T0, T1, T2, T3, T4) as QueryFragment<__DB>>
191+
<(T0, T1, T2, T3, T4, T5) as QueryFragment<__DB>>
192+
<(T0, T1, T2, T3, T4, T5, T6) as QueryFragment<__DB>>
193193
and $N others
194194
= note: required for `(f64, f64)` to implement `QueryFragment<Pg>`
195195
= note: 4 redundant requirements hidden
@@ -215,14 +215,14 @@ error[E0277]: the trait bound `f64: diesel::Expression` is not satisfied
215215
| required by a bound introduced by this call
216216
|
217217
= help: the following other types implement trait `diesel::Expression`:
218-
Box<T>
219-
diesel::expression::ops::numeric::Add<Lhs, Rhs>
220-
diesel::expression::ops::numeric::Sub<Lhs, Rhs>
221-
diesel::expression::ops::numeric::Mul<Lhs, Rhs>
222-
diesel::expression::ops::numeric::Div<Lhs, Rhs>
223-
now
224-
today
225-
In<T, U>
218+
&'a T
219+
(T0, T1)
220+
(T0, T1, T2)
221+
(T0, T1, T2, T3)
222+
(T0, T1, T2, T3, T4)
223+
(T0, T1, T2, T3, T4, T5)
224+
(T0, T1, T2, T3, T4, T5, T6)
225+
(T0, T1, T2, T3, T4, T5, T6, T7)
226226
and $N others
227227
= note: required for `f64` to implement `AsExpression<diesel::sql_types::Integer>`
228228
= note: required for `(f64, f64)` to implement `AsExpressionList<diesel::sql_types::Integer>`

0 commit comments

Comments
 (0)