Skip to content

Commit c9de1b8

Browse files
jebrosenjebrosen
committed
Raise the nightly version to one that accepts '...(format!(...)).await'. This additionally reverts commit bdbf80f.
1 parent 0796fc3 commit c9de1b8

File tree

18 files changed

+59
-82
lines changed

18 files changed

+59
-82
lines changed

‎core/codegen/tests/route-ranking.rs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,13 @@ async fn test_ranking() {
2626
let mut response = client.get("/0").dispatch().await;
2727
assert_eq!(response.body_string().await.unwrap(), "0");
2828

29-
let request = client.get(format!("/{}", 1 << 8));
30-
let mut response = request.dispatch().await;
29+
let mut response = client.get(format!("/{}", 1 << 8)).dispatch().await;
3130
assert_eq!(response.body_string().await.unwrap(), "1");
3231

33-
let request = client.get(format!("/{}", 1 << 16));
34-
let mut response = request.dispatch().await;
32+
let mut response = client.get(format!("/{}", 1 << 16)).dispatch().await;
3533
assert_eq!(response.body_string().await.unwrap(), "2");
3634

37-
let request = client.get(format!("/{}", 1u64 << 32));
38-
let mut response = request.dispatch().await;
35+
let mut response = client.get(format!("/{}", 1u64 << 32)).dispatch().await;
3936
assert_eq!(response.body_string().await.unwrap(), "3");
4037
}
4138

‎core/codegen/tests/route.rs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,28 +102,26 @@ async fn test_full_route() {
102102
let response = client.post(&uri).body(simple).dispatch().await;
103103
assert_eq!(response.status(), Status::NotFound);
104104

105-
let request = client.post(format!("/1{}", uri)).body(simple);
106-
let response = request.dispatch().await;
105+
let response = client.post(format!("/1{}", uri)).body(simple).dispatch().await;
107106
assert_eq!(response.status(), Status::NotFound);
108107

109-
let request = client
108+
let mut response = client
110109
.post(format!("/1{}", uri))
111110
.header(ContentType::JSON)
112-
.body(simple);
113-
let mut response = request.dispatch().await;
111+
.body(simple)
112+
.dispatch().await;
114113

115114
assert_eq!(response.body_string().await.unwrap(), format!("({}, {}, {}, {}, {}, {}) ({})",
116115
sky, name, "A A", "inside", path, simple, expected_uri));
117116

118-
let request = client.post(format!("/2{}", uri)).body(simple);
119-
let response = request.dispatch().await;
117+
let response = client.post(format!("/2{}", uri)).body(simple).dispatch().await;
120118
assert_eq!(response.status(), Status::NotFound);
121119

122-
let request = client
120+
let mut response = client
123121
.post(format!("/2{}", uri))
124122
.header(ContentType::JSON)
125-
.body(simple);
126-
let mut response = request.dispatch().await;
123+
.body(simple)
124+
.dispatch().await;
127125

128126
assert_eq!(response.body_string().await.unwrap(), format!("({}, {}, {}, {}, {}, {}) ({})",
129127
sky, name, "A A", "inside", path, simple, expected_uri));

‎core/lib/build.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
use yansi::{Paint, Color::{Red, Yellow, Blue}};
44

55
// Specifies the minimum nightly version needed to compile Rocket.
6-
const MIN_DATE: &'static str = "2019-08-20";
7-
const MIN_VERSION: &'static str = "1.39.0-nightly";
6+
7+
const MIN_DATE: &'static str = "2019-11-24";
8+
const MIN_VERSION: &'static str = "1.41.0-nightly";
89

910
macro_rules! err {
1011
($version:expr, $date:expr, $msg:expr) => (

‎core/lib/src/data/data.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,7 @@ impl Data {
171171
pub fn stream_to_file<P: AsRef<Path> + Send + Unpin + 'static>(self, path: P) -> impl Future<Output = io::Result<u64>> {
172172
Box::pin(async move {
173173
let mut file = tokio::fs::File::create(path).await?;
174-
let streaming = self.stream_to(&mut file);
175-
streaming.await
174+
self.stream_to(&mut file).await
176175
})
177176
}
178177

‎core/lib/src/local/request.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,7 @@ impl<'c> LocalRequest<'c> {
348348
#[inline(always)]
349349
pub async fn dispatch(mut self) -> LocalResponse<'c> {
350350
let r = self.long_lived_request();
351-
let dispatching = LocalRequest::_dispatch(self.client, r, self.request, &self.uri, self.data);
352-
dispatching.await
351+
LocalRequest::_dispatch(self.client, r, self.request, &self.uri, self.data).await
353352
}
354353

355354
/// Dispatches the request, returning the response.

‎core/lib/tests/form_value_decoding-issue-82.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ mod tests {
2222

2323
async fn check_decoding(raw: &str, decoded: &str) {
2424
let client = Client::new(rocket::ignite().mount("/", routes![bug])).unwrap();
25-
let request = client.post("/")
25+
let mut response = client.post("/")
2626
.header(ContentType::Form)
27-
.body(format!("form_data={}", raw));
28-
let mut response = request.dispatch().await;
27+
.body(format!("form_data={}", raw))
28+
.dispatch().await;
2929

3030
assert_eq!(response.status(), Status::Ok);
3131
assert_eq!(Some(decoded.to_string()), response.body_string().await);

‎core/lib/tests/segments-issues-41-86.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ mod tests {
4747
"/static", "/point/static"]
4848
{
4949
let path = "this/is/the/path/we/want";
50-
let request = client.get(format!("{}/{}", prefix, path));
51-
let mut response = request.dispatch().await;
50+
let mut response = client.get(format!("{}/{}", prefix, path)).dispatch().await;
5251
assert_eq!(response.body_string().await, Some(path.into()));
5352
}
5453
}

‎core/lib/tests/strict_and_lenient_forms.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,37 +34,37 @@ mod strict_and_lenient_forms_tests {
3434
#[rocket::async_test]
3535
async fn test_strict_form() {
3636
let client = client();
37-
let request = client.post("/strict")
37+
let mut response = client.post("/strict")
3838
.header(ContentType::Form)
39-
.body(format!("field={}", FIELD_VALUE));
40-
let mut response = request.dispatch().await;
39+
.body(format!("field={}", FIELD_VALUE))
40+
.dispatch().await;
4141

4242
assert_eq!(response.status(), Status::Ok);
4343
assert_eq!(response.body_string().await, Some(FIELD_VALUE.into()));
4444

45-
let request = client.post("/strict")
45+
let response = client.post("/strict")
4646
.header(ContentType::Form)
47-
.body(format!("field={}&extra=whoops", FIELD_VALUE));
48-
let response = request.dispatch().await;
47+
.body(format!("field={}&extra=whoops", FIELD_VALUE))
48+
.dispatch().await;
4949

5050
assert_eq!(response.status(), Status::UnprocessableEntity);
5151
}
5252

5353
#[rocket::async_test]
5454
async fn test_lenient_form() {
5555
let client = client();
56-
let request = client.post("/lenient")
56+
let mut response = client.post("/lenient")
5757
.header(ContentType::Form)
58-
.body(format!("field={}", FIELD_VALUE));
59-
let mut response = request.dispatch().await;
58+
.body(format!("field={}", FIELD_VALUE))
59+
.dispatch().await;
6060

6161
assert_eq!(response.status(), Status::Ok);
6262
assert_eq!(response.body_string().await, Some(FIELD_VALUE.into()));
6363

64-
let request = client.post("/lenient")
64+
let mut response = client.post("/lenient")
6565
.header(ContentType::Form)
66-
.body(format!("field={}&extra=whoops", FIELD_VALUE));
67-
let mut response = request.dispatch().await;
66+
.body(format!("field={}&extra=whoops", FIELD_VALUE))
67+
.dispatch().await;
6868

6969
assert_eq!(response.status(), Status::Ok);
7070
assert_eq!(response.body_string().await, Some(FIELD_VALUE.into()));

‎core/lib/tests/uri-percent-encoding-issue-808.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ mod tests {
5252
async fn uri_percent_encoding_get() {
5353
let client = Client::new(rocket()).unwrap();
5454
let name = Uri::percent_encode(NAME);
55-
let request = client.get(format!("/hello/{}", name));
56-
let mut response = request.dispatch().await;
55+
let mut response = client.get(format!("/hello/{}", name)).dispatch().await;
5756
assert_eq!(response.status(), Status::Ok);
5857
assert_eq!(response.body_string().await.unwrap(), format!("Hello, {}!", NAME));
5958
}

‎examples/errors/src/tests.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ async fn test(uri: &str, status: Status, body: String) {
77
.register(catchers![super::not_found]);
88

99
let client = Client::new(rocket).unwrap();
10-
let request = client.get(uri);
11-
let mut response = request.dispatch().await;
10+
let mut response = client.get(uri).dispatch().await;
1211
assert_eq!(response.status(), status);
1312
assert_eq!(response.body_string().await, Some(body));
1413
}
@@ -17,8 +16,7 @@ async fn test(uri: &str, status: Status, body: String) {
1716
async fn test_hello() {
1817
let (name, age) = ("Arthur", 42);
1918
let uri = format!("/hello/{}/{}", name, age);
20-
let expected = format!("Hello, {} year old named {}!", age, name);
21-
test(&uri, Status::Ok, expected).await;
19+
test(&uri, Status::Ok, format!("Hello, {} year old named {}!", age, name)).await;
2220
}
2321

2422
#[rocket::async_test]

0 commit comments

Comments
 (0)