Skip to content

Commit f0ccdbe

Browse files
committed
Fix formatting
1 parent 00da4df commit f0ccdbe

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

core/codegen/src/attribute/catch/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pub fn _catch(
8383
name: stringify!(#user_catcher_fn_name),
8484
code: #status_code,
8585
handler: monomorphized_function,
86-
route_type: #_Box::new(self),
86+
catcher_type: #_Box::new(self),
8787
}
8888
}
8989

core/lib/src/local/response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ macro_rules! pub_response_impl {
214214
/// # Example
215215
///
216216
/// ```rust
217-
/// # use rocket::get;
217+
/// # use rocket::catch;
218218
/// #[catch(404)]
219219
/// fn default_404() -> &'static str { "Hello World" }
220220
#[doc = $doc_prelude]

examples/hello/src/tests.rs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,18 @@ fn hello() {
3030

3131
let uri = format!("/?{}{}{}", q("lang", lang), q("emoji", emoji), q("name", name));
3232
let response = client.get(uri).dispatch();
33-
assert!(response.routed_by::<super::hello>(), "Response was not generated by the `hello` route");
33+
assert!(
34+
response.routed_by::<super::hello>(),
35+
"Response was not generated by the `hello` route"
36+
);
3437
assert_eq!(response.into_string().unwrap(), expected);
3538

3639
let uri = format!("/?{}{}{}", q("emoji", emoji), q("name", name), q("lang", lang));
3740
let response = client.get(uri).dispatch();
38-
assert!(response.routed_by::<super::hello>(), "Response was not generated by the `hello` route");
41+
assert!(
42+
response.routed_by::<super::hello>(),
43+
"Response was not generated by the `hello` route"
44+
);
3945
assert_eq!(response.into_string().unwrap(), expected);
4046
}
4147
}
@@ -44,7 +50,10 @@ fn hello() {
4450
fn hello_world() {
4551
let client = Client::tracked(super::rocket()).unwrap();
4652
let response = client.get("/hello/world").dispatch();
47-
assert!(response.routed_by::<super::world>(), "Response was not generated by the `world` route");
53+
assert!(
54+
response.routed_by::<super::world>(),
55+
"Response was not generated by the `world` route"
56+
);
4857
assert_eq!(response.into_string(), Some("Hello, world!".into()));
4958
}
5059

@@ -64,13 +73,19 @@ fn wave() {
6473
let real_name = RawStr::new(name).percent_decode_lossy();
6574
let expected = format!("👋 Hello, {} year old named {}!", age, real_name);
6675
let response = client.get(uri).dispatch();
67-
assert!(response.routed_by::<super::wave>(), "Response was not generated by the `wave` route");
76+
assert!(
77+
response.routed_by::<super::wave>(),
78+
"Response was not generated by the `wave` route"
79+
);
6880
assert_eq!(response.into_string().unwrap(), expected);
6981

7082
for bad_age in &["1000", "-1", "bird", "?"] {
7183
let bad_uri = format!("/wave/{}/{}", name, bad_age);
7284
let response = client.get(bad_uri).dispatch();
73-
assert!(response.caught_by::<rocket::catcher::DefaultCatcher>(), "Response was not generated by the default catcher");
85+
assert!(
86+
response.caught_by::<rocket::catcher::DefaultCatcher>(),
87+
"Response was not generated by the default catcher"
88+
);
7489
assert_eq!(response.status(), Status::NotFound);
7590
}
7691
}

0 commit comments

Comments
 (0)