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

+3-6
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

+8-10
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

+3-2
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

+1-2
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

+1-2
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

+3-3
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

+1-2
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

+12-12
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

+1-2
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

+2-4
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]

‎examples/hello_person/src/tests.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ async fn test_404(uri: &'static str) {
1818
#[rocket::async_test]
1919
async fn test_hello() {
2020
for &(name, age) in &[("Mike", 22), ("Michael", 80), ("A", 0), ("a", 127)] {
21-
let uri = format!("/hello/{}/{}", name, age);
22-
let expected = format!("Hello, {} year old named {}!", age, name);
23-
test(uri, expected).await;
21+
test(format!("/hello/{}/{}", name, age),
22+
format!("Hello, {} year old named {}!", age, name)).await;
2423
}
2524
}
2625

@@ -34,7 +33,6 @@ async fn test_failing_hello() {
3433
#[rocket::async_test]
3534
async fn test_hi() {
3635
for name in &["Mike", "A", "123", "hi", "c"] {
37-
let uri = format!("/hello/{}", name);
38-
test(uri, name.to_string()).await;
36+
test(format!("/hello/{}", name), name.to_string()).await;
3937
}
4038
}

‎examples/manual_routes/src/main.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ fn upload<'r>(req: &'r Request, data: Data) -> HandlerFuture<'r> {
5252
let file = File::create(env::temp_dir().join("upload.txt")).await;
5353
if let Ok(file) = file {
5454
if let Ok(n) = data.stream_to(file).await {
55-
let response = format!("OK: {} bytes uploaded.", n);
56-
return Outcome::from(req, response).await;
55+
return Outcome::from(req, format!("OK: {} bytes uploaded.", n)).await;
5756
}
5857

5958
println!(" => Failed copying.");
@@ -94,8 +93,7 @@ impl Handler for CustomHandler {
9493
.or_forward(data);
9594

9695
let id = try_outcome!(id_outcome);
97-
let response = format!("{} - {}", self_data, id);
98-
Outcome::from(req, response).await
96+
Outcome::from(req, format!("{} - {}", self_data, id)).await
9997
})
10098
}
10199
}

‎examples/manual_routes/src/tests.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ use rocket::http::{ContentType, Status};
55
fn test(uri: &str, content_type: ContentType, status: Status, body: String) {
66
rocket::async_test(async move {
77
let client = Client::new(rocket()).unwrap();
8-
let request = client.get(uri).header(content_type);
9-
let mut response = request.dispatch().await;
8+
let mut response = client.get(uri).header(content_type).dispatch().await;
109
assert_eq!(response.status(), status);
1110
assert_eq!(response.body_string().await, Some(body));
1211
})

‎examples/pastebin/src/tests.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ async fn upload_paste(client: &Client, body: &str) -> String {
2525
}
2626

2727
async fn download_paste(client: &Client, id: &str) -> String {
28-
let request = client.get(format!("/{}", id));
29-
let mut response = request.dispatch().await;
28+
let mut response = client.get(format!("/{}", id)).dispatch().await;
3029
assert_eq!(response.status(), Status::Ok);
3130
response.body_string().await.unwrap()
3231
}

‎examples/query_params/src/tests.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ use rocket::http::Status;
55
macro_rules! run_test {
66
($query:expr, |$response:ident| $body:expr) => ({
77
let client = Client::new(rocket()).unwrap();
8-
let request = client.get(format!("/hello{}", $query));
98
#[allow(unused_mut)]
10-
let mut $response = request.dispatch().await;
9+
let mut $response = client.get(format!("/hello{}", $query)).dispatch().await;
1110
$body
1211
})
1312
}

‎examples/ranking/src/tests.rs

+7-10
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,29 @@ use rocket::local::Client;
33
async fn test(uri: String, expected: String) {
44
let rocket = rocket::ignite().mount("/", routes![super::hello, super::hi]);
55
let client = Client::new(rocket).unwrap();
6-
let mut response = client.get(uri).dispatch().await;
6+
let mut response = client.get(&uri).dispatch().await;
77
assert_eq!(response.body_string().await, Some(expected));
88
}
99

1010
#[rocket::async_test]
1111
async fn test_hello() {
1212
for &(name, age) in &[("Mike", 22), ("Michael", 80), ("A", 0), ("a", 127)] {
13-
let uri = format!("/hello/{}/{}", name, age);
14-
let expected = format!("Hello, {} year old named {}!", age, name);
15-
test(uri, expected).await;
13+
test(format!("/hello/{}/{}", name, age),
14+
format!("Hello, {} year old named {}!", age, name)).await;
1615
}
1716
}
1817

1918
#[rocket::async_test]
2019
async fn test_failing_hello_hi() {
2120
// Invalid integers.
2221
for &(name, age) in &[("Mike", 1000), ("Michael", 128), ("A", -800), ("a", -200)] {
23-
let uri = format!("/hello/{}/{}", name, age);
24-
let expected = format!("Hi {}! Your age ({}) is kind of funky.", name, age);
25-
test(uri, expected).await;
22+
test(format!("/hello/{}/{}", name, age),
23+
format!("Hi {}! Your age ({}) is kind of funky.", name, age)).await;
2624
}
2725

2826
// Non-integers.
2927
for &(name, age) in &[("Mike", "!"), ("Michael", "hi"), ("A", "blah"), ("a", "0-1")] {
30-
let uri = format!("/hello/{}/{}", name, age);
31-
let expected = format!("Hi {}! Your age ({}) is kind of funky.", name, age);
32-
test(uri, expected).await;
28+
test(format!("/hello/{}/{}", name, age),
29+
format!("Hi {}! Your age ({}) is kind of funky.", name, age)).await;
3330
}
3431
}

‎examples/session/src/tests.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ fn user_id_cookie(response: &Response<'_>) -> Option<Cookie<'static>> {
1414
}
1515

1616
async fn login(client: &Client, user: &str, pass: &str) -> Option<Cookie<'static>> {
17-
let request = client.post("/login")
17+
let response = client.post("/login")
1818
.header(ContentType::Form)
19-
.body(format!("username={}&password={}", user, pass));
20-
let response = request.dispatch().await;
19+
.body(format!("username={}&password={}", user, pass))
20+
.dispatch().await;
2121

2222
user_id_cookie(&response)
2323
}

‎examples/todo/src/tests.rs

+6-9
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ fn test_insertion_deletion() {
4949

5050
// Issue a request to delete the task.
5151
let id = new_tasks[0].id.unwrap();
52-
let request = client.delete(format!("/todo/{}", id));
53-
request.dispatch().await;
52+
client.delete(format!("/todo/{}", id)).dispatch().await;
5453

5554
// Ensure it's gone.
5655
let final_tasks = Task::all(&conn);
@@ -74,13 +73,11 @@ fn test_toggle() {
7473
assert_eq!(task.completed, false);
7574

7675
// Issue a request to toggle the task; ensure it is completed.
77-
let request = client.put(format!("/todo/{}", task.id.unwrap()));
78-
request.dispatch().await;
76+
client.put(format!("/todo/{}", task.id.unwrap())).dispatch().await;
7977
assert_eq!(Task::all(&conn)[0].completed, true);
8078

8179
// Issue a request to toggle the task; ensure it's not completed again.
82-
let request = client.put(format!("/todo/{}", task.id.unwrap()));
83-
request.dispatch().await;
80+
client.put(format!("/todo/{}", task.id.unwrap())).dispatch().await;
8481
assert_eq!(Task::all(&conn)[0].completed, false);
8582
})
8683
}
@@ -97,10 +94,10 @@ fn test_many_insertions() {
9794
for i in 0..ITER {
9895
// Issue a request to insert a new task with a random description.
9996
let desc: String = thread_rng().sample_iter(&Alphanumeric).take(12).collect();
100-
let request = client.post("/todo")
97+
client.post("/todo")
10198
.header(ContentType::Form)
102-
.body(format!("description={}", desc));
103-
request.dispatch().await;
99+
.body(format!("description={}", desc))
100+
.dispatch().await;
104101

105102
// Record the description we choose for this iteration.
106103
descs.insert(0, desc);

0 commit comments

Comments
 (0)