diff --git a/contrib/ws/src/lib.rs b/contrib/ws/src/lib.rs index a8c2d895..06affb00 100644 --- a/contrib/ws/src/lib.rs +++ b/contrib/ws/src/lib.rs @@ -141,7 +141,7 @@ pub use self::tungstenite::Message; /// max_send_queue: Some(5), /// // Decrease the maximum (complete) message size to 4MiB. /// max_message_size: Some(4.mebibytes().as_u64() as usize), -/// // Decrease the maximum size of _one_ frame (not messag) to 1MiB. +/// // Decrease the maximum size of _one_ frame (not message) to 1MiB. /// max_frame_size: Some(1.mebibytes().as_u64() as usize), /// // Use the default values for the rest. /// ..Default::default() diff --git a/core/codegen/tests/from_form.rs b/core/codegen/tests/from_form.rs index 621ffa04..568840d1 100644 --- a/core/codegen/tests/from_form.rs +++ b/core/codegen/tests/from_form.rs @@ -444,7 +444,7 @@ fn form_validate_contains_all_errors() { #[field(validate = evaluate())] firstname: String, check: bool, - // this validator is hardcoded to return an error but it doesnt + // this validator is hardcoded to return an error but it doesn't #[field(validate = evaluate_with_argument(self.check))] lastname: String, } diff --git a/core/codegen/tests/ui-fail-nightly/async-entry.stderr b/core/codegen/tests/ui-fail-nightly/async-entry.stderr index f6acb157..3a763033 100644 --- a/core/codegen/tests/ui-fail-nightly/async-entry.stderr +++ b/core/codegen/tests/ui-fail-nightly/async-entry.stderr @@ -47,7 +47,7 @@ error: attribute cannot be applied to `main` function note: this function cannot be `main` --> tests/ui-fail-nightly/async-entry.rs:50:8 | -50 | fn main() -> rocekt::Rocket { +50 | fn main() -> rocket::Rocket { | ^^^^ = note: this error originates in the attribute macro `rocket::launch` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/core/codegen/tests/ui-fail-stable/async-entry.stderr b/core/codegen/tests/ui-fail-stable/async-entry.stderr index d3ac4cc7..b300d054 100644 --- a/core/codegen/tests/ui-fail-stable/async-entry.stderr +++ b/core/codegen/tests/ui-fail-stable/async-entry.stderr @@ -38,7 +38,7 @@ error: attribute cannot be applied to `main` function error: [note] this function cannot be `main` --> tests/ui-fail-stable/async-entry.rs:50:8 | -50 | fn main() -> rocekt::Rocket { +50 | fn main() -> rocket::Rocket { | ^^^^ error: attribute can only be applied to functions that return a value diff --git a/core/codegen/tests/ui-fail/async-entry.rs b/core/codegen/tests/ui-fail/async-entry.rs index bea02a42..35f5e13b 100644 --- a/core/codegen/tests/ui-fail/async-entry.rs +++ b/core/codegen/tests/ui-fail/async-entry.rs @@ -47,7 +47,7 @@ mod launch_b { mod launch_c { #[rocket::launch] - fn main() -> rocekt::Rocket { + fn main() -> rocket::Rocket { rocket::build() } } diff --git a/core/lib/src/form/mod.rs b/core/lib/src/form/mod.rs index 442c455a..44487876 100644 --- a/core/lib/src/form/mod.rs +++ b/core/lib/src/form/mod.rs @@ -114,7 +114,7 @@ // .map_err(|e| errors.push(e)) // .map(Some).unwrap_or(None); // -// let field_b = B::finblize(&mut this.field_b) +// let field_b = B::finalize(&mut this.field_b) // .map_err(|e| errors.push(e)) // .map(Some).unwrap_or(None); // diff --git a/core/lib/src/local/request.rs b/core/lib/src/local/request.rs index a04ff5d7..eabe933e 100644 --- a/core/lib/src/local/request.rs +++ b/core/lib/src/local/request.rs @@ -200,7 +200,7 @@ macro_rules! pub_request_impl { /// Set mTLS client certificates to send along with the request. /// /// If the request already contained certificates, they are replaced with - /// thsoe in `reader.` + /// those in `reader.` /// /// `reader` is expected to be PEM-formatted and contain X509 certificates. /// If it contains more than one certificate, the entire chain is set on the diff --git a/core/lib/src/request/from_request.rs b/core/lib/src/request/from_request.rs index 203c7d49..a0776aaa 100644 --- a/core/lib/src/request/from_request.rs +++ b/core/lib/src/request/from_request.rs @@ -89,7 +89,7 @@ pub type Outcome = outcome::Outcome; /// * **Forward**(Status) /// /// If the `Outcome` is [`Forward`], the request will be forwarded to the next -/// matching route until either one succeds or there are no further matching +/// matching route until either one succeeds or there are no further matching /// routes to attempt. In the latter case, the request will be sent to the /// [`Catcher`](crate::Catcher) for the designated `Status`. Note that users /// can request an `Option` to catch `Forward`s. diff --git a/core/lib/src/response/stream/sse.rs b/core/lib/src/response/stream/sse.rs index b123f632..ae244579 100644 --- a/core/lib/src/response/stream/sse.rs +++ b/core/lib/src/response/stream/sse.rs @@ -783,7 +783,7 @@ mod sse_tests { yield Event::data("bar"); }; - // We expect: foo\n\n [heartbeat] bar\n\n [maybe beartbeat]. + // We expect: foo\n\n [heartbeat] bar\n\n [maybe heartbeat]. let string = stream.heartbeat(Duration::from_millis(350)).into_string(); let heartbeats = string.matches(HEARTBEAT).count(); assert!(heartbeats >= 1 && heartbeats <= 3, "got {} beat(s)", heartbeats); diff --git a/core/lib/src/shield/policy.rs b/core/lib/src/shield/policy.rs index 18280d46..3ac3bc79 100644 --- a/core/lib/src/shield/policy.rs +++ b/core/lib/src/shield/policy.rs @@ -176,10 +176,10 @@ impl From<&Referrer> for Header<'static> { /// The [Expect-CT] header: enables reporting and/or enforcement of [Certificate /// Transparency]. /// -/// [Certificate Transparency] can detect and prevent the use of misissued, -/// malicious, or revoked TLS certificates. It solves a variety of problems with -/// public TLS/SSL certificate management and is valuable measure for all public -/// TLS applications. +/// [Certificate Transparency] can detect and prevent the use of incorrectly +/// issued malicious, or revoked TLS certificates. It solves a variety of +/// problems with public TLS/SSL certificate management and is valuable measure +/// for all public TLS applications. /// /// If you're just [getting started] with certificate transparency, ensure that /// your [site is in compliance][getting started] before you enable enforcement diff --git a/core/lib/tests/file_server.rs b/core/lib/tests/file_server.rs index 69416eda..c0b33e53 100644 --- a/core/lib/tests/file_server.rs +++ b/core/lib/tests/file_server.rs @@ -145,7 +145,7 @@ fn test_forwarding() { fn test_redirection() { let client = Client::debug(rocket()).expect("valid rocket"); - // Redirection only happens if enabled, and doesn't affect index behaviour. + // Redirection only happens if enabled, and doesn't affect index behavior. let response = client.get("/no_index/inner").dispatch(); assert_eq!(response.status(), Status::NotFound); diff --git a/site/guide/5-responses.md b/site/guide/5-responses.md index 56656d91..831b31ac 100644 --- a/site/guide/5-responses.md +++ b/site/guide/5-responses.md @@ -504,8 +504,8 @@ fn index() -> Template { } ``` -For a template to be renderable, it must first be registered. The `Template` -fairing automatically registers all discoverable templates when attached. The +To render a template, it must first be registered. The `Template` fairing +automatically registers all discoverable templates when attached. The [Fairings](../fairings) sections of the guide provides more information on fairings. To attach the template fairing, simply call `.attach(Template::fairing())` on an instance of `Rocket` as follows: diff --git a/site/guide/6-state.md b/site/guide/6-state.md index ac974ffd..fb70b883 100644 --- a/site/guide/6-state.md +++ b/site/guide/6-state.md @@ -21,7 +21,7 @@ The process for using managed state is simple: ! note: All managed state must be thread-safe. - Because Rocket automatically multithreads your application, handlers can + Because Rocket automatically parallelizes your application, handlers can concurrently access managed state. As a result, managed state must be thread-safe. Thanks to Rust, this condition is checked at compile-time by ensuring that the type of values you store in managed state implement `Send` + diff --git a/site/news/2017-02-06-version-0.2.md b/site/news/2017-02-06-version-0.2.md index b94aabea..f657f9d8 100644 --- a/site/news/2017-02-06-version-0.2.md +++ b/site/news/2017-02-06-version-0.2.md @@ -17,7 +17,7 @@ contributors at the end of this article. ## About Rocket -Rocket is a web framework for Rust with a focus on ease of use, expressibility, +Rocket is a web framework for Rust with a focus on ease of use, expressiveness, and speed. Rocket makes it simple to write fast web applications without sacrificing flexibility or type safety. All with minimal code. diff --git a/site/news/2017-07-14-version-0.3.md b/site/news/2017-07-14-version-0.3.md index 566fe64d..e4228782 100644 --- a/site/news/2017-07-14-version-0.3.md +++ b/site/news/2017-07-14-version-0.3.md @@ -15,7 +15,7 @@ support: a sincere thank you to everyone involved! ## About Rocket -Rocket is a web framework for Rust with a focus on ease of use, expressibility, +Rocket is a web framework for Rust with a focus on ease of use, expressiveness, and speed. Rocket makes it simple to write fast web applications without sacrificing flexibility or type safety. All with minimal code. diff --git a/site/news/2018-10-31-version-0.4-rc.md b/site/news/2018-10-31-version-0.4-rc.md index 5958bd3d..56e3c9b6 100644 --- a/site/news/2018-10-31-version-0.4-rc.md +++ b/site/news/2018-10-31-version-0.4-rc.md @@ -31,7 +31,7 @@ Friday, November 9th for the general release! ## About Rocket -Rocket is a web framework for Rust with a focus on ease of use, expressibility, +Rocket is a web framework for Rust with a focus on ease of use, expressiveness, and speed. Rocket makes it simple to write fast web applications without sacrificing flexibility or type safety. All with minimal code. diff --git a/site/news/2018-11-30-version-0.4-rc-2.md b/site/news/2018-11-30-version-0.4-rc-2.md index 048a729b..5474e2a7 100644 --- a/site/news/2018-11-30-version-0.4-rc-2.md +++ b/site/news/2018-11-30-version-0.4-rc-2.md @@ -38,7 +38,7 @@ Wednesday, December 5th for the general release! ## About Rocket -Rocket is a web framework for Rust with a focus on ease of use, expressibility, +Rocket is a web framework for Rust with a focus on ease of use, expressiveness, and speed. Rocket makes it simple to write fast web applications without sacrificing flexibility or type safety. All with minimal code.