Skip to content

Commit f35f3a1

Browse files
renovate[bot]ahl
renovate[bot]
and
ahl
authored
Update dependency rust to v1.91.1 (#1474)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Adam H. Leventhal <[email protected]>
1 parent 7ab7e65 commit f35f3a1

14 files changed

+415
-74
lines changed

‎dropshot/src/api_description.rs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -301,24 +301,19 @@ pub enum ApiEndpointParameterMetadata {
301301
Body(ApiEndpointBodyContentType),
302302
}
303303

304-
#[derive(Debug, Clone)]
304+
#[derive(Debug, Clone, Default)]
305305
pub enum ApiEndpointBodyContentType {
306306
/// application/octet-stream
307307
Bytes,
308308
/// application/json
309+
#[default]
309310
Json,
310311
/// application/x-www-form-urlencoded
311312
UrlEncoded,
312313
/// multipart/form-data
313314
MultipartFormData,
314315
}
315316

316-
impl Default for ApiEndpointBodyContentType {
317-
fn default() -> Self {
318-
Self::Json
319-
}
320-
}
321-
322317
impl ApiEndpointBodyContentType {
323318
pub fn mime_type(&self) -> &str {
324319
match self {

‎dropshot/tests/fail/bad_channel4.stderr‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfi
22
--> tests/fail/bad_channel4.rs:22:14
33
|
44
22 | _params: Query<QueryParams>,
5-
| ^^^^^^^^^^^^^^^^^^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
5+
| ^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
66
|
7+
help: the trait `schemars::JsonSchema` is not implemented for `QueryParams`
8+
--> tests/fail/bad_channel4.rs:11:1
9+
|
10+
11 | struct QueryParams {
11+
| ^^^^^^^^^^^^^^^^^^
712
= help: the following other types implement trait `schemars::JsonSchema`:
813
&'a T
914
&'a mut T
@@ -24,8 +29,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
2429
--> tests/fail/bad_channel4.rs:22:14
2530
|
2631
22 | _params: Query<QueryParams>,
27-
| ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
32+
| ^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
33+
|
34+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
35+
--> tests/fail/bad_channel4.rs:11:1
2836
|
37+
11 | struct QueryParams {
38+
| ^^^^^^^^^^^^^^^^^^
2939
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
3040
= note: for types from other crates check whether the crate offers a `serde` feature flag
3141
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:
@@ -53,8 +63,13 @@ error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfi
5363
22 | | _params: Query<QueryParams>,
5464
23 | | _upgraded: WebsocketConnection,
5565
24 | | ) -> dropshot::WebsocketChannelResult {
56-
| |_____________________________________^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
66+
| |_____________________________________^ unsatisfied trait bound
67+
|
68+
help: the trait `schemars::JsonSchema` is not implemented for `QueryParams`
69+
--> tests/fail/bad_channel4.rs:11:1
5770
|
71+
11 | struct QueryParams {
72+
| ^^^^^^^^^^^^^^^^^^
5873
= help: the following other types implement trait `schemars::JsonSchema`:
5974
&'a T
6075
&'a mut T
@@ -79,8 +94,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
7994
22 | | _params: Query<QueryParams>,
8095
23 | | _upgraded: WebsocketConnection,
8196
24 | | ) -> dropshot::WebsocketChannelResult {
82-
| |_____________________________________^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
97+
| |_____________________________________^ unsatisfied trait bound
8398
|
99+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
100+
--> tests/fail/bad_channel4.rs:11:1
101+
|
102+
11 | struct QueryParams {
103+
| ^^^^^^^^^^^^^^^^^^
84104
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
85105
= note: for types from other crates check whether the crate offers a `serde` feature flag
86106
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:
@@ -107,8 +127,13 @@ error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfi
107127
17 | | protocol = WEBSOCKETS,
108128
18 | | path = "/test",
109129
19 | | }]
110-
| |__^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
130+
| |__^ unsatisfied trait bound
131+
|
132+
help: the trait `schemars::JsonSchema` is not implemented for `QueryParams`
133+
--> tests/fail/bad_channel4.rs:11:1
111134
|
135+
11 | struct QueryParams {
136+
| ^^^^^^^^^^^^^^^^^^
112137
= help: the following other types implement trait `schemars::JsonSchema`:
113138
&'a T
114139
&'a mut T
@@ -133,8 +158,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
133158
17 | | protocol = WEBSOCKETS,
134159
18 | | path = "/test",
135160
19 | | }]
136-
| |__^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
161+
| |__^ unsatisfied trait bound
162+
|
163+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
164+
--> tests/fail/bad_channel4.rs:11:1
137165
|
166+
11 | struct QueryParams {
167+
| ^^^^^^^^^^^^^^^^^^
138168
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
139169
= note: for types from other crates check whether the crate offers a `serde` feature flag
140170
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:

‎dropshot/tests/fail/bad_channel5.stderr‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
22
--> tests/fail/bad_channel5.rs:24:14
33
|
44
24 | _params: Query<QueryParams>,
5-
| ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
5+
| ^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
66
|
7+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
8+
--> tests/fail/bad_channel5.rs:13:1
9+
|
10+
13 | struct QueryParams {
11+
| ^^^^^^^^^^^^^^^^^^
712
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
813
= note: for types from other crates check whether the crate offers a `serde` feature flag
914
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:
@@ -31,8 +36,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
3136
24 | | _params: Query<QueryParams>,
3237
25 | | _upgraded: WebsocketConnection,
3338
26 | | ) -> dropshot::WebsocketChannelResult {
34-
| |_____________________________________^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
39+
| |_____________________________________^ unsatisfied trait bound
40+
|
41+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
42+
--> tests/fail/bad_channel5.rs:13:1
3543
|
44+
13 | struct QueryParams {
45+
| ^^^^^^^^^^^^^^^^^^
3646
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
3747
= note: for types from other crates check whether the crate offers a `serde` feature flag
3848
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:
@@ -59,8 +69,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
5969
19 | | protocol = WEBSOCKETS,
6070
20 | | path = "/test",
6171
21 | | }]
62-
| |__^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
72+
| |__^ unsatisfied trait bound
73+
|
74+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
75+
--> tests/fail/bad_channel5.rs:13:1
6376
|
77+
13 | struct QueryParams {
78+
| ^^^^^^^^^^^^^^^^^^
6479
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
6580
= note: for types from other crates check whether the crate offers a `serde` feature flag
6681
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:

‎dropshot/tests/fail/bad_endpoint4.stderr‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfi
22
--> tests/fail/bad_endpoint4.rs:23:14
33
|
44
23 | _params: Query<QueryParams>,
5-
| ^^^^^^^^^^^^^^^^^^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
5+
| ^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
66
|
7+
help: the trait `schemars::JsonSchema` is not implemented for `QueryParams`
8+
--> tests/fail/bad_endpoint4.rs:12:1
9+
|
10+
12 | struct QueryParams {
11+
| ^^^^^^^^^^^^^^^^^^
712
= help: the following other types implement trait `schemars::JsonSchema`:
813
&'a T
914
&'a mut T
@@ -24,8 +29,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
2429
--> tests/fail/bad_endpoint4.rs:23:14
2530
|
2631
23 | _params: Query<QueryParams>,
27-
| ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
32+
| ^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
33+
|
34+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
35+
--> tests/fail/bad_endpoint4.rs:12:1
2836
|
37+
12 | struct QueryParams {
38+
| ^^^^^^^^^^^^^^^^^^
2939
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
3040
= note: for types from other crates check whether the crate offers a `serde` feature flag
3141
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:
@@ -52,8 +62,13 @@ error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfi
5262
22 | | _rqctx: RequestContext<()>,
5363
23 | | _params: Query<QueryParams>,
5464
24 | | ) -> Result<HttpResponseOk<()>, HttpError> {
55-
| |__________________________________________^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
65+
| |__________________________________________^ unsatisfied trait bound
66+
|
67+
help: the trait `schemars::JsonSchema` is not implemented for `QueryParams`
68+
--> tests/fail/bad_endpoint4.rs:12:1
5669
|
70+
12 | struct QueryParams {
71+
| ^^^^^^^^^^^^^^^^^^
5772
= help: the following other types implement trait `schemars::JsonSchema`:
5873
&'a T
5974
&'a mut T
@@ -77,8 +92,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
7792
22 | | _rqctx: RequestContext<()>,
7893
23 | | _params: Query<QueryParams>,
7994
24 | | ) -> Result<HttpResponseOk<()>, HttpError> {
80-
| |__________________________________________^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
95+
| |__________________________________________^ unsatisfied trait bound
8196
|
97+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
98+
--> tests/fail/bad_endpoint4.rs:12:1
99+
|
100+
12 | struct QueryParams {
101+
| ^^^^^^^^^^^^^^^^^^
82102
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
83103
= note: for types from other crates check whether the crate offers a `serde` feature flag
84104
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:
@@ -126,8 +146,13 @@ error[E0277]: the trait bound `QueryParams: schemars::JsonSchema` is not satisfi
126146
18 | | method = GET,
127147
19 | | path = "/test",
128148
20 | | }]
129-
| |__^ the trait `schemars::JsonSchema` is not implemented for `QueryParams`
149+
| |__^ unsatisfied trait bound
150+
|
151+
help: the trait `schemars::JsonSchema` is not implemented for `QueryParams`
152+
--> tests/fail/bad_endpoint4.rs:12:1
130153
|
154+
12 | struct QueryParams {
155+
| ^^^^^^^^^^^^^^^^^^
131156
= help: the following other types implement trait `schemars::JsonSchema`:
132157
&'a T
133158
&'a mut T
@@ -152,8 +177,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
152177
18 | | method = GET,
153178
19 | | path = "/test",
154179
20 | | }]
155-
| |__^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
180+
| |__^ unsatisfied trait bound
181+
|
182+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
183+
--> tests/fail/bad_endpoint4.rs:12:1
156184
|
185+
12 | struct QueryParams {
186+
| ^^^^^^^^^^^^^^^^^^
157187
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
158188
= note: for types from other crates check whether the crate offers a `serde` feature flag
159189
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:

‎dropshot/tests/fail/bad_endpoint5.stderr‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
22
--> tests/fail/bad_endpoint5.rs:25:14
33
|
44
25 | _params: Query<QueryParams>,
5-
| ^^^^^^^^^^^^^^^^^^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
5+
| ^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
66
|
7+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
8+
--> tests/fail/bad_endpoint5.rs:14:1
9+
|
10+
14 | struct QueryParams {
11+
| ^^^^^^^^^^^^^^^^^^
712
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
813
= note: for types from other crates check whether the crate offers a `serde` feature flag
914
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:
@@ -30,8 +35,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
3035
24 | | _rqctx: RequestContext<()>,
3136
25 | | _params: Query<QueryParams>,
3237
26 | | ) -> Result<HttpResponseOk<()>, HttpError> {
33-
| |__________________________________________^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
38+
| |__________________________________________^ unsatisfied trait bound
39+
|
40+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
41+
--> tests/fail/bad_endpoint5.rs:14:1
3442
|
43+
14 | struct QueryParams {
44+
| ^^^^^^^^^^^^^^^^^^
3545
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
3646
= note: for types from other crates check whether the crate offers a `serde` feature flag
3747
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:
@@ -79,8 +89,13 @@ error[E0277]: the trait bound `QueryParams: serde::Deserialize<'de>` is not sati
7989
20 | | method = GET,
8090
21 | | path = "/test",
8191
22 | | }]
82-
| |__^ the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
92+
| |__^ unsatisfied trait bound
93+
|
94+
help: the trait `for<'de> serde_core::de::Deserialize<'de>` is not implemented for `QueryParams`
95+
--> tests/fail/bad_endpoint5.rs:14:1
8396
|
97+
14 | struct QueryParams {
98+
| ^^^^^^^^^^^^^^^^^^
8499
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `QueryParams` type
85100
= note: for types from other crates check whether the crate offers a `serde` feature flag
86101
= help: the following other types implement trait `serde_core::de::Deserialize<'de>`:

‎dropshot/tests/fail/bad_endpoint7.stderr‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ error[E0277]: the trait bound `Ret: dropshot::handler::HttpResponseContent` is n
88
26 | | x: "Oxide".to_string(),
99
27 | | y: 0x1de,
1010
28 | | }))
11-
| |_____^ the trait `serde_core::ser::Serialize` is not implemented for `Ret`
11+
| |_____^ unsatisfied trait bound
1212
|
13+
help: the trait `serde_core::ser::Serialize` is not implemented for `Ret`
14+
--> tests/fail/bad_endpoint7.rs:13:1
15+
|
16+
13 | struct Ret {
17+
| ^^^^^^^^^^
1318
= help: the following other types implement trait `serde_core::ser::Serialize`:
1419
&'a T
1520
&'a mut T
@@ -31,8 +36,13 @@ error[E0277]: the trait bound `Ret: serde::Serialize` is not satisfied
3136
--> tests/fail/bad_endpoint7.rs:25:5
3237
|
3338
25 | Ok(HttpResponseOk(Ret {
34-
| ^^ the trait `serde_core::ser::Serialize` is not implemented for `Ret`
39+
| ^^ unsatisfied trait bound
40+
|
41+
help: the trait `serde_core::ser::Serialize` is not implemented for `Ret`
42+
--> tests/fail/bad_endpoint7.rs:13:1
3543
|
44+
13 | struct Ret {
45+
| ^^^^^^^^^^
3646
= note: for local types consider adding `#[derive(serde::Serialize)]` to your `Ret` type
3747
= note: for types from other crates check whether the crate offers a `serde` feature flag
3848
= help: the following other types implement trait `serde_core::ser::Serialize`:
@@ -59,8 +69,13 @@ error[E0277]: the trait bound `Ret: serde::Serialize` is not satisfied
5969
26 | | x: "Oxide".to_string(),
6070
27 | | y: 0x1de,
6171
28 | | }))
62-
| |_______^ the trait `serde_core::ser::Serialize` is not implemented for `Ret`
72+
| |_______^ unsatisfied trait bound
73+
|
74+
help: the trait `serde_core::ser::Serialize` is not implemented for `Ret`
75+
--> tests/fail/bad_endpoint7.rs:13:1
6376
|
77+
13 | struct Ret {
78+
| ^^^^^^^^^^
6479
= note: for local types consider adding `#[derive(serde::Serialize)]` to your `Ret` type
6580
= note: for types from other crates check whether the crate offers a `serde` feature flag
6681
= help: the following other types implement trait `serde_core::ser::Serialize`:
@@ -86,8 +101,13 @@ error[E0277]: the trait bound `Ret: serde::Serialize` is not satisfied
86101
22 | / async fn bad_endpoint(
87102
23 | | _rqctx: RequestContext<()>,
88103
24 | | ) -> Result<HttpResponseOk<Ret>, HttpError> {
89-
| |___________________________________________^ the trait `serde_core::ser::Serialize` is not implemented for `Ret`
104+
| |___________________________________________^ unsatisfied trait bound
90105
|
106+
help: the trait `serde_core::ser::Serialize` is not implemented for `Ret`
107+
--> tests/fail/bad_endpoint7.rs:13:1
108+
|
109+
13 | struct Ret {
110+
| ^^^^^^^^^^
91111
= note: for local types consider adding `#[derive(serde::Serialize)]` to your `Ret` type
92112
= note: for types from other crates check whether the crate offers a `serde` feature flag
93113
= help: the following other types implement trait `serde_core::ser::Serialize`:
@@ -111,8 +131,13 @@ error[E0277]: the trait bound `Ret: serde::Serialize` is not satisfied
111131
--> tests/fail/bad_endpoint7.rs:24:6
112132
|
113133
24 | ) -> Result<HttpResponseOk<Ret>, HttpError> {
114-
| ^^^^^^ the trait `serde_core::ser::Serialize` is not implemented for `Ret`
134+
| ^^^^^^ unsatisfied trait bound
135+
|
136+
help: the trait `serde_core::ser::Serialize` is not implemented for `Ret`
137+
--> tests/fail/bad_endpoint7.rs:13:1
115138
|
139+
13 | struct Ret {
140+
| ^^^^^^^^^^
116141
= note: for local types consider adding `#[derive(serde::Serialize)]` to your `Ret` type
117142
= note: for types from other crates check whether the crate offers a `serde` feature flag
118143
= help: the following other types implement trait `serde_core::ser::Serialize`:

0 commit comments

Comments
 (0)