Skip to content

Commit d4a0495

Browse files
weiznichweiznich
committed
Merge pull request #5035 from weiznich/bump/rust_1.95
Bump to rust 1.95
1 parent 5e0289e commit d4a0495

114 files changed

Lines changed: 1247 additions & 1232 deletions

File tree

Some content is hidden

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

‎diesel_compile_tests/Cargo.lock‎

Lines changed: 52 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎diesel_compile_tests/tests/fail/aggregate_expression_requires_column_from_same_table.stderr‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ LL | id -> Integer,
1111
| ^^
1212
= note: `posts::columns::id` is no valid selection for `users::table`
1313
= help: the following other types implement trait `SelectableExpression<QS>`:
14-
`posts::columns::id` implements `SelectableExpression<JoinOn<Join, On>>`
1514
`posts::columns::id` implements `SelectableExpression<Only<posts::table>>`
16-
`posts::columns::id` implements `SelectableExpression<SelectStatement<FromClause<From>>>`
1715
`posts::columns::id` implements `SelectableExpression<Tablesample<posts::table, TSM>>`
16+
`posts::columns::id` implements `SelectableExpression<SelectStatement<...>>`
1817
`posts::columns::id` implements `SelectableExpression<posts::table>`
1918
`posts::columns::id` implements `SelectableExpression<Join<Left, Right, Inner>>`
2019
`posts::columns::id` implements `SelectableExpression<Join<Left, Right, LeftOuter>>`
20+
`posts::columns::id` implements `SelectableExpression<query_source::joins::JoinOn<Join, On>>`
2121
= note: required for `sum<Integer, id>` to implement `SelectableExpression<users::table>`
22-
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<sum<Integer, id>>`
22+
= note: required for `SelectStatement<FromClause<table>>` to implement `SelectDsl<sum<Integer, id>>`
2323

2424
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
2525

@@ -38,7 +38,7 @@ LL | id -> Integer,
3838
= note: 1 redundant requirement hidden
3939
= note: required for `sum<Integer, id>` to implement `AppearsOnTable<users::table>`
4040
= note: required for `sum<Integer, id>` to implement `SelectableExpression<users::table>`
41-
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<sum<Integer, id>>`
41+
= note: required for `SelectStatement<FromClause<table>>` to implement `SelectDsl<sum<Integer, id>>`
4242

4343
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
4444

@@ -55,15 +55,15 @@ LL | id -> Integer,
5555
| ^^
5656
= note: `posts::columns::id` is no valid selection for `users::table`
5757
= help: the following other types implement trait `SelectableExpression<QS>`:
58-
`posts::columns::id` implements `SelectableExpression<JoinOn<Join, On>>`
5958
`posts::columns::id` implements `SelectableExpression<Only<posts::table>>`
60-
`posts::columns::id` implements `SelectableExpression<SelectStatement<FromClause<From>>>`
6159
`posts::columns::id` implements `SelectableExpression<Tablesample<posts::table, TSM>>`
60+
`posts::columns::id` implements `SelectableExpression<SelectStatement<...>>`
6261
`posts::columns::id` implements `SelectableExpression<posts::table>`
6362
`posts::columns::id` implements `SelectableExpression<Join<Left, Right, Inner>>`
6463
`posts::columns::id` implements `SelectableExpression<Join<Left, Right, LeftOuter>>`
64+
`posts::columns::id` implements `SelectableExpression<query_source::joins::JoinOn<Join, On>>`
6565
= note: required for `avg<Integer, id>` to implement `SelectableExpression<users::table>`
66-
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<avg<Integer, id>>`
66+
= note: required for `SelectStatement<FromClause<table>>` to implement `SelectDsl<avg<Integer, id>>`
6767

6868
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
6969

@@ -82,7 +82,7 @@ LL | id -> Integer,
8282
= note: 1 redundant requirement hidden
8383
= note: required for `avg<Integer, id>` to implement `AppearsOnTable<users::table>`
8484
= note: required for `avg<Integer, id>` to implement `SelectableExpression<users::table>`
85-
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<avg<Integer, id>>`
85+
= note: required for `SelectStatement<FromClause<table>>` to implement `SelectDsl<avg<Integer, id>>`
8686

8787
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
8888

@@ -99,15 +99,15 @@ LL | id -> Integer,
9999
| ^^
100100
= note: `posts::columns::id` is no valid selection for `users::table`
101101
= help: the following other types implement trait `SelectableExpression<QS>`:
102-
`posts::columns::id` implements `SelectableExpression<JoinOn<Join, On>>`
103102
`posts::columns::id` implements `SelectableExpression<Only<posts::table>>`
104-
`posts::columns::id` implements `SelectableExpression<SelectStatement<FromClause<From>>>`
105103
`posts::columns::id` implements `SelectableExpression<Tablesample<posts::table, TSM>>`
104+
`posts::columns::id` implements `SelectableExpression<SelectStatement<...>>`
106105
`posts::columns::id` implements `SelectableExpression<posts::table>`
107106
`posts::columns::id` implements `SelectableExpression<Join<Left, Right, Inner>>`
108107
`posts::columns::id` implements `SelectableExpression<Join<Left, Right, LeftOuter>>`
108+
`posts::columns::id` implements `SelectableExpression<query_source::joins::JoinOn<Join, On>>`
109109
= note: required for `max<Integer, id>` to implement `SelectableExpression<users::table>`
110-
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<max<Integer, id>>`
110+
= note: required for `SelectStatement<FromClause<table>>` to implement `SelectDsl<max<Integer, id>>`
111111

112112
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
113113

@@ -126,7 +126,7 @@ LL | id -> Integer,
126126
= note: 1 redundant requirement hidden
127127
= note: required for `max<Integer, id>` to implement `AppearsOnTable<users::table>`
128128
= note: required for `max<Integer, id>` to implement `SelectableExpression<users::table>`
129-
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<max<Integer, id>>`
129+
= note: required for `SelectStatement<FromClause<table>>` to implement `SelectDsl<max<Integer, id>>`
130130

131131
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
132132

@@ -143,15 +143,15 @@ LL | id -> Integer,
143143
| ^^
144144
= note: `posts::columns::id` is no valid selection for `users::table`
145145
= help: the following other types implement trait `SelectableExpression<QS>`:
146-
`posts::columns::id` implements `SelectableExpression<JoinOn<Join, On>>`
147146
`posts::columns::id` implements `SelectableExpression<Only<posts::table>>`
148-
`posts::columns::id` implements `SelectableExpression<SelectStatement<FromClause<From>>>`
149147
`posts::columns::id` implements `SelectableExpression<Tablesample<posts::table, TSM>>`
148+
`posts::columns::id` implements `SelectableExpression<SelectStatement<...>>`
150149
`posts::columns::id` implements `SelectableExpression<posts::table>`
151150
`posts::columns::id` implements `SelectableExpression<Join<Left, Right, Inner>>`
152151
`posts::columns::id` implements `SelectableExpression<Join<Left, Right, LeftOuter>>`
152+
`posts::columns::id` implements `SelectableExpression<query_source::joins::JoinOn<Join, On>>`
153153
= note: required for `min<Integer, id>` to implement `SelectableExpression<users::table>`
154-
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<min<Integer, id>>`
154+
= note: required for `SelectStatement<FromClause<table>>` to implement `SelectDsl<min<Integer, id>>`
155155

156156
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)
157157

@@ -170,6 +170,6 @@ LL | id -> Integer,
170170
= note: 1 redundant requirement hidden
171171
= note: required for `min<Integer, id>` to implement `AppearsOnTable<users::table>`
172172
= note: required for `min<Integer, id>` to implement `SelectableExpression<users::table>`
173-
= note: required for `SelectStatement<FromClause<users::table>>` to implement `SelectDsl<min<Integer, id>>`
173+
= note: required for `SelectStatement<FromClause<table>>` to implement `SelectDsl<min<Integer, id>>`
174174

175175
= note: this error originates in the macro `table` (in Nightly builds, run with -Z macro-backtrace for more info)

0 commit comments

Comments
 (0)