Skip to content

Commit 15062de

Browse files
SergioBenitezSergioBenitez
committed
Update UI tests for latest rustc.
1 parent d4723bb commit 15062de

15 files changed

+725
-725
lines changed

‎core/codegen/tests/ui-fail-nightly/catch.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ error[E0308]: arguments to this function are incorrect
6666
--> tests/ui-fail-nightly/catch.rs:30:4
6767
|
6868
30 | fn f3(_request: &Request, _other: bool) { }
69-
| ^^ -------- ---- an argument of type `bool` is missing
69+
| ^^ -------- ---- argument #2 of type `bool` is missing
7070
| |
71-
| unexpected argument of type `Status`
71+
| unexpected argument #1 of type `Status`
7272
|
7373
note: function defined here
7474
--> tests/ui-fail-nightly/catch.rs:30:4

‎core/codegen/tests/ui-fail-nightly/catch_type_errors.stderr

+32-32
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
77
| ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
88
|
99
= help: the following other types implement trait `Responder<'r, 'o>`:
10-
<&'o [u8] as Responder<'r, 'o>>
11-
<&'o str as Responder<'r, 'o>>
12-
<() as Responder<'r, 'static>>
13-
<(ContentType, R) as Responder<'r, 'o>>
14-
<(Status, R) as Responder<'r, 'o>>
15-
<Accepted<R> as Responder<'r, 'o>>
16-
<Arc<[u8]> as Responder<'r, 'static>>
17-
<Arc<str> as Responder<'r, 'static>>
10+
`&'o [u8]` implements `Responder<'r, 'o>`
11+
`&'o str` implements `Responder<'r, 'o>`
12+
`()` implements `Responder<'r, 'static>`
13+
`(ContentType, R)` implements `Responder<'r, 'o>`
14+
`(Status, R)` implements `Responder<'r, 'o>`
15+
`Accepted<R>` implements `Responder<'r, 'o>`
16+
`Arc<[u8]>` implements `Responder<'r, 'static>`
17+
`Arc<str>` implements `Responder<'r, 'static>`
1818
and $N others
1919

2020
error[E0277]: the trait bound `bool: Responder<'_, '_>` is not satisfied
@@ -26,14 +26,14 @@ error[E0277]: the trait bound `bool: Responder<'_, '_>` is not satisfied
2626
| ^^^^ the trait `Responder<'_, '_>` is not implemented for `bool`
2727
|
2828
= help: the following other types implement trait `Responder<'r, 'o>`:
29-
<&'o [u8] as Responder<'r, 'o>>
30-
<&'o str as Responder<'r, 'o>>
31-
<() as Responder<'r, 'static>>
32-
<(ContentType, R) as Responder<'r, 'o>>
33-
<(Status, R) as Responder<'r, 'o>>
34-
<Accepted<R> as Responder<'r, 'o>>
35-
<Arc<[u8]> as Responder<'r, 'static>>
36-
<Arc<str> as Responder<'r, 'static>>
29+
`&'o [u8]` implements `Responder<'r, 'o>`
30+
`&'o str` implements `Responder<'r, 'o>`
31+
`()` implements `Responder<'r, 'static>`
32+
`(ContentType, R)` implements `Responder<'r, 'o>`
33+
`(Status, R)` implements `Responder<'r, 'o>`
34+
`Accepted<R>` implements `Responder<'r, 'o>`
35+
`Arc<[u8]>` implements `Responder<'r, 'static>`
36+
`Arc<str>` implements `Responder<'r, 'static>`
3737
and $N others
3838

3939
error[E0308]: mismatched types
@@ -59,14 +59,14 @@ error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
5959
| ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
6060
|
6161
= help: the following other types implement trait `Responder<'r, 'o>`:
62-
<&'o [u8] as Responder<'r, 'o>>
63-
<&'o str as Responder<'r, 'o>>
64-
<() as Responder<'r, 'static>>
65-
<(ContentType, R) as Responder<'r, 'o>>
66-
<(Status, R) as Responder<'r, 'o>>
67-
<Accepted<R> as Responder<'r, 'o>>
68-
<Arc<[u8]> as Responder<'r, 'static>>
69-
<Arc<str> as Responder<'r, 'static>>
62+
`&'o [u8]` implements `Responder<'r, 'o>`
63+
`&'o str` implements `Responder<'r, 'o>`
64+
`()` implements `Responder<'r, 'static>`
65+
`(ContentType, R)` implements `Responder<'r, 'o>`
66+
`(Status, R)` implements `Responder<'r, 'o>`
67+
`Accepted<R>` implements `Responder<'r, 'o>`
68+
`Arc<[u8]>` implements `Responder<'r, 'static>`
69+
`Arc<str>` implements `Responder<'r, 'static>`
7070
and $N others
7171

7272
error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
@@ -78,12 +78,12 @@ error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
7878
| ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
7979
|
8080
= help: the following other types implement trait `Responder<'r, 'o>`:
81-
<&'o [u8] as Responder<'r, 'o>>
82-
<&'o str as Responder<'r, 'o>>
83-
<() as Responder<'r, 'static>>
84-
<(ContentType, R) as Responder<'r, 'o>>
85-
<(Status, R) as Responder<'r, 'o>>
86-
<Accepted<R> as Responder<'r, 'o>>
87-
<Arc<[u8]> as Responder<'r, 'static>>
88-
<Arc<str> as Responder<'r, 'static>>
81+
`&'o [u8]` implements `Responder<'r, 'o>`
82+
`&'o str` implements `Responder<'r, 'o>`
83+
`()` implements `Responder<'r, 'static>`
84+
`(ContentType, R)` implements `Responder<'r, 'o>`
85+
`(Status, R)` implements `Responder<'r, 'o>`
86+
`Accepted<R>` implements `Responder<'r, 'o>`
87+
`Arc<[u8]>` implements `Responder<'r, 'static>`
88+
`Arc<str>` implements `Responder<'r, 'static>`
8989
and $N others

‎core/codegen/tests/ui-fail-nightly/from_form.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -543,13 +543,13 @@ error[E0277]: the trait bound `bool: From<&str>` is not satisfied
543543
| this tail expression is of type `&str`
544544
|
545545
= help: the following other types implement trait `From<T>`:
546-
<bool as From<format_description::parse::format_item::HourBase>>
547-
<bool as From<format_description::parse::format_item::MonthCaseSensitive>>
548-
<bool as From<format_description::parse::format_item::PeriodCase>>
549-
<bool as From<format_description::parse::format_item::PeriodCaseSensitive>>
550-
<bool as From<format_description::parse::format_item::SignBehavior>>
551-
<bool as From<format_description::parse::format_item::WeekdayCaseSensitive>>
552-
<bool as From<format_description::parse::format_item::WeekdayOneIndexed>>
553-
<bool as From<format_description::parse::format_item::YearBase>>
546+
`bool` implements `From<format_description::parse::format_item::HourBase>`
547+
`bool` implements `From<format_description::parse::format_item::MonthCaseSensitive>`
548+
`bool` implements `From<format_description::parse::format_item::PeriodCase>`
549+
`bool` implements `From<format_description::parse::format_item::PeriodCaseSensitive>`
550+
`bool` implements `From<format_description::parse::format_item::SignBehavior>`
551+
`bool` implements `From<format_description::parse::format_item::WeekdayCaseSensitive>`
552+
`bool` implements `From<format_description::parse::format_item::WeekdayOneIndexed>`
553+
`bool` implements `From<format_description::parse::format_item::YearBase>`
554554
= note: required for `&str` to implement `Into<bool>`
555555
= note: this error originates in the derive macro `FromForm` (in Nightly builds, run with -Z macro-backtrace for more info)

‎core/codegen/tests/ui-fail-nightly/from_form_type_errors.stderr

+18-18
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ error[E0277]: the trait bound `Unknown: FromForm<'r>` is not satisfied
131131
7 | field: Unknown,
132132
| ^^^^^^^ the trait `FromFormField<'_>` is not implemented for `Unknown`, which is required by `Unknown: FromForm<'r>`
133133
|
134-
= help: the following other types implement trait `FromForm<'r>`:
135-
<(A, B) as FromForm<'v>>
136-
<Arc<T> as FromForm<'v>>
137-
<BTreeMap<K, V> as FromForm<'v>>
138-
<BadType3 as FromForm<'r>>
139-
<Contextual<'v, T> as FromForm<'v>>
140-
<HashMap<K, V> as FromForm<'v>>
141-
<Lenient<T> as FromForm<'v>>
142-
<Other as FromForm<'r>>
134+
= help: the following other types implement trait `FromFormField<'v>`:
135+
&'v [u8]
136+
&'v str
137+
Capped<&'v [u8]>
138+
Capped<&'v str>
139+
Capped<Cow<'v, str>>
140+
Capped<TempFile<'v>>
141+
Capped<std::string::String>
142+
Cow<'v, str>
143143
and $N others
144144
= note: required for `Unknown` to implement `FromForm<'r>`
145145

@@ -190,15 +190,15 @@ error[E0277]: the trait bound `Foo<usize>: FromForm<'r>` is not satisfied
190190
14 | field: Foo<usize>,
191191
| ^^^^^^^^^^ the trait `FromFormField<'_>` is not implemented for `Foo<usize>`, which is required by `Foo<usize>: FromForm<'r>`
192192
|
193-
= help: the following other types implement trait `FromForm<'r>`:
194-
<(A, B) as FromForm<'v>>
195-
<Arc<T> as FromForm<'v>>
196-
<BTreeMap<K, V> as FromForm<'v>>
197-
<BadType3 as FromForm<'r>>
198-
<Contextual<'v, T> as FromForm<'v>>
199-
<HashMap<K, V> as FromForm<'v>>
200-
<Lenient<T> as FromForm<'v>>
201-
<Other as FromForm<'r>>
193+
= help: the following other types implement trait `FromFormField<'v>`:
194+
&'v [u8]
195+
&'v str
196+
Capped<&'v [u8]>
197+
Capped<&'v str>
198+
Capped<Cow<'v, str>>
199+
Capped<TempFile<'v>>
200+
Capped<std::string::String>
201+
Cow<'v, str>
202202
and $N others
203203
= note: required for `Foo<usize>` to implement `FromForm<'r>`
204204

‎core/codegen/tests/ui-fail-nightly/responder-types.stderr

+48-48
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ error[E0277]: the trait bound `u8: Responder<'_, '_>` is not satisfied
55
| ^^ the trait `Responder<'_, '_>` is not implemented for `u8`
66
|
77
= help: the following other types implement trait `Responder<'r, 'o>`:
8-
<&'o [u8] as Responder<'r, 'o>>
9-
<&'o str as Responder<'r, 'o>>
10-
<() as Responder<'r, 'static>>
11-
<(ContentType, R) as Responder<'r, 'o>>
12-
<(Status, R) as Responder<'r, 'o>>
13-
<Accepted<R> as Responder<'r, 'o>>
14-
<Arc<[u8]> as Responder<'r, 'static>>
15-
<Arc<str> as Responder<'r, 'static>>
8+
`&'o [u8]` implements `Responder<'r, 'o>`
9+
`&'o str` implements `Responder<'r, 'o>`
10+
`()` implements `Responder<'r, 'static>`
11+
`(ContentType, R)` implements `Responder<'r, 'o>`
12+
`(Status, R)` implements `Responder<'r, 'o>`
13+
`Accepted<R>` implements `Responder<'r, 'o>`
14+
`Arc<[u8]>` implements `Responder<'r, 'static>`
15+
`Arc<str>` implements `Responder<'r, 'static>`
1616
and $N others
1717

1818
error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
@@ -22,14 +22,14 @@ error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
2222
| ^^^^^^^^^ the trait `From<u8>` is not implemented for `Header<'_>`, which is required by `u8: Into<Header<'_>>`
2323
|
2424
= help: the following other types implement trait `From<T>`:
25-
<Header<'static> as From<&Cookie<'_>>>
26-
<Header<'static> as From<&ExpectCt>>
27-
<Header<'static> as From<&Frame>>
28-
<Header<'static> as From<&Hsts>>
29-
<Header<'static> as From<&NoSniff>>
30-
<Header<'static> as From<&Permission>>
31-
<Header<'static> as From<&Prefetch>>
32-
<Header<'static> as From<&Referrer>>
25+
`Header<'static>` implements `From<&Cookie<'_>>`
26+
`Header<'static>` implements `From<&ExpectCt>`
27+
`Header<'static>` implements `From<&Frame>`
28+
`Header<'static>` implements `From<&Hsts>`
29+
`Header<'static>` implements `From<&NoSniff>`
30+
`Header<'static>` implements `From<&Permission>`
31+
`Header<'static>` implements `From<&Prefetch>`
32+
`Header<'static>` implements `From<&Referrer>`
3333
and $N others
3434
= note: required for `u8` to implement `Into<Header<'_>>`
3535
note: required by a bound in `Response::<'r>::set_header`
@@ -45,14 +45,14 @@ error[E0277]: the trait bound `u8: Responder<'_, '_>` is not satisfied
4545
| ^^ the trait `Responder<'_, '_>` is not implemented for `u8`
4646
|
4747
= help: the following other types implement trait `Responder<'r, 'o>`:
48-
<&'o [u8] as Responder<'r, 'o>>
49-
<&'o str as Responder<'r, 'o>>
50-
<() as Responder<'r, 'static>>
51-
<(ContentType, R) as Responder<'r, 'o>>
52-
<(Status, R) as Responder<'r, 'o>>
53-
<Accepted<R> as Responder<'r, 'o>>
54-
<Arc<[u8]> as Responder<'r, 'static>>
55-
<Arc<str> as Responder<'r, 'static>>
48+
`&'o [u8]` implements `Responder<'r, 'o>`
49+
`&'o str` implements `Responder<'r, 'o>`
50+
`()` implements `Responder<'r, 'static>`
51+
`(ContentType, R)` implements `Responder<'r, 'o>`
52+
`(Status, R)` implements `Responder<'r, 'o>`
53+
`Accepted<R>` implements `Responder<'r, 'o>`
54+
`Arc<[u8]>` implements `Responder<'r, 'static>`
55+
`Arc<str>` implements `Responder<'r, 'static>`
5656
and $N others
5757

5858
error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
@@ -62,14 +62,14 @@ error[E0277]: the trait bound `Header<'_>: From<u8>` is not satisfied
6262
| ^^^^^^^^^ the trait `From<u8>` is not implemented for `Header<'_>`, which is required by `u8: Into<Header<'_>>`
6363
|
6464
= help: the following other types implement trait `From<T>`:
65-
<Header<'static> as From<&Cookie<'_>>>
66-
<Header<'static> as From<&ExpectCt>>
67-
<Header<'static> as From<&Frame>>
68-
<Header<'static> as From<&Hsts>>
69-
<Header<'static> as From<&NoSniff>>
70-
<Header<'static> as From<&Permission>>
71-
<Header<'static> as From<&Prefetch>>
72-
<Header<'static> as From<&Referrer>>
65+
`Header<'static>` implements `From<&Cookie<'_>>`
66+
`Header<'static>` implements `From<&ExpectCt>`
67+
`Header<'static>` implements `From<&Frame>`
68+
`Header<'static>` implements `From<&Hsts>`
69+
`Header<'static>` implements `From<&NoSniff>`
70+
`Header<'static>` implements `From<&Permission>`
71+
`Header<'static>` implements `From<&Prefetch>`
72+
`Header<'static>` implements `From<&Referrer>`
7373
and $N others
7474
= note: required for `u8` to implement `Into<Header<'_>>`
7575
note: required by a bound in `Response::<'r>::set_header`
@@ -85,14 +85,14 @@ error[E0277]: the trait bound `Header<'_>: From<std::string::String>` is not sat
8585
| ^^^^^^^^^^^^ the trait `From<std::string::String>` is not implemented for `Header<'_>`, which is required by `std::string::String: Into<Header<'_>>`
8686
|
8787
= help: the following other types implement trait `From<T>`:
88-
<Header<'static> as From<&Cookie<'_>>>
89-
<Header<'static> as From<&ExpectCt>>
90-
<Header<'static> as From<&Frame>>
91-
<Header<'static> as From<&Hsts>>
92-
<Header<'static> as From<&NoSniff>>
93-
<Header<'static> as From<&Permission>>
94-
<Header<'static> as From<&Prefetch>>
95-
<Header<'static> as From<&Referrer>>
88+
`Header<'static>` implements `From<&Cookie<'_>>`
89+
`Header<'static>` implements `From<&ExpectCt>`
90+
`Header<'static>` implements `From<&Frame>`
91+
`Header<'static>` implements `From<&Hsts>`
92+
`Header<'static>` implements `From<&NoSniff>`
93+
`Header<'static>` implements `From<&Permission>`
94+
`Header<'static>` implements `From<&Prefetch>`
95+
`Header<'static>` implements `From<&Referrer>`
9696
and $N others
9797
= note: required for `std::string::String` to implement `Into<Header<'_>>`
9898
note: required by a bound in `Response::<'r>::set_header`
@@ -110,14 +110,14 @@ error[E0277]: the trait bound `usize: Responder<'_, '_>` is not satisfied
110110
| ^^^^^ the trait `Responder<'_, '_>` is not implemented for `usize`
111111
|
112112
= help: the following other types implement trait `Responder<'r, 'o>`:
113-
<&'o [u8] as Responder<'r, 'o>>
114-
<&'o str as Responder<'r, 'o>>
115-
<() as Responder<'r, 'static>>
116-
<(ContentType, R) as Responder<'r, 'o>>
117-
<(Status, R) as Responder<'r, 'o>>
118-
<Accepted<R> as Responder<'r, 'o>>
119-
<Arc<[u8]> as Responder<'r, 'static>>
120-
<Arc<str> as Responder<'r, 'static>>
113+
`&'o [u8]` implements `Responder<'r, 'o>`
114+
`&'o str` implements `Responder<'r, 'o>`
115+
`()` implements `Responder<'r, 'static>`
116+
`(ContentType, R)` implements `Responder<'r, 'o>`
117+
`(Status, R)` implements `Responder<'r, 'o>`
118+
`Accepted<R>` implements `Responder<'r, 'o>`
119+
`Arc<[u8]>` implements `Responder<'r, 'static>`
120+
`Arc<str>` implements `Responder<'r, 'static>`
121121
and $N others
122122
note: required by a bound in `route::handler::<impl Outcome<Response<'o>, Status, (rocket::Data<'o>, Status)>>::from`
123123
--> $WORKSPACE/core/lib/src/route/handler.rs

0 commit comments

Comments
 (0)