Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
with:
key: ${{ matrix.test.name }}-${{ steps.toolchain.outputs.cachekey }}

# Don't run out of disk space on Windows. C: has much much space than D:.
# Don't run out of disk space on Windows. C: has much more space than D:.
- name: Switch Disk (Windows)
if: matrix.platform.name == 'Windows'
run: |
Expand Down
4 changes: 2 additions & 2 deletions core/codegen/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ pub fn launch(args: TokenStream, input: TokenStream) -> TokenStream {
///
/// The attribute accepts a single string parameter of name `value`
/// corresponding to the string to use to match against for the decorated
/// variant. In the example above, the the strings `"fourth"`, `"FOUrth"`,
/// variant. In the example above, the strings `"fourth"`, `"FOUrth"`,
/// `"fiFTH"` and so on would parse as `MyValue::Third`.
///
/// [`FromFormField`]: ../rocket/form/trait.FromFormField.html
Expand Down Expand Up @@ -1403,7 +1403,7 @@ pub fn catchers(input: TokenStream) -> TokenStream {
///
/// ## Prefixes and Suffixes
///
/// A route URI can be be optionally prefixed and/or suffixed by a URI generated
/// A route URI can be optionally prefixed and/or suffixed by a URI generated
/// from a string literal or an arbitrary expression. This takes the form
/// `uri!(prefix, foo(v1, v2, v3), suffix)`, where both `prefix` and `suffix`
/// are optional, and either `prefix` or `suffix` may be `_` to specify the
Expand Down
2 changes: 1 addition & 1 deletion core/http/src/parse/uri/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub fn complete<I, P, O>(input: &mut Pear<I>, p: P) -> input::Result<O, I>
(p()?, eof()?).0
}

/// TODO: Have a way to ask for for preference in ambiguity resolution.
/// TODO: Have a way to ask for preference in ambiguity resolution.
/// * An ordered [Preference] is probably best.
/// * Need to filter/uniqueify. See `uri-pref`.
/// Once we have this, we should probably set the default so that `authority` is
Expand Down
2 changes: 1 addition & 1 deletion core/http/src/uri/fmt/formatter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ impl Formatter<'_, Query> {
// by recursive (nested) calls to `write_raw`. The string is
// pushed in `PrefixGuard` here and then popped in `Drop`.
// `prefixes` is modified nowhere else, and no concrete-lifetime
// strings leak from the the vector. As a result, it is
// strings leak from the vector. As a result, it is
// impossible for a `prefix` to be accessed incorrectly as:
//
// * Rust _guarantees_ `prefix` is valid for this method
Expand Down
4 changes: 2 additions & 2 deletions core/lib/src/catcher/catcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::catcher::{Handler, BoxFuture};
///
/// Catchers are routes that run when errors are produced by the application.
/// They consist of a [`Handler`] and an optional status code to match against
/// arising errors. Errors arise from the the following sources:
/// arising errors. Errors arise from the following sources:
///
/// * A failing guard.
/// * A failing responder.
Expand Down Expand Up @@ -220,7 +220,7 @@ impl Catcher {

/// Prefix `base` to the current `base` in `self.`
///
/// If the the current base is `/`, then the base is replaced by `base`.
/// If the current base is `/`, then the base is replaced by `base`.
/// Otherwise, `base` is prefixed to the existing `base`.
///
/// ```rust
Expand Down
2 changes: 1 addition & 1 deletion core/lib/src/outcome.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ use self::Outcome::*;
pub enum Outcome<S, E, F> {
/// Contains the success value.
Success(S),
/// Contains the error error value.
/// Contains the error value.
Error(E),
/// Contains the value to forward on.
Forward(F),
Expand Down
2 changes: 1 addition & 1 deletion core/lib/src/route/route.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ impl Route {

/// Prefix `base` to any existing mount point base in `self`.
///
/// If the the current mount point base is `/`, then the base is replaced by
/// If the current mount point base is `/`, then the base is replaced by
/// `base`. Otherwise, `base` is prefixed to the existing `base`.
///
/// ```rust
Expand Down
2 changes: 1 addition & 1 deletion examples/tls/src/redirector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ impl Redirector {
Redirector(port)
}

// Launch an instance of Rocket than handles redirection on `self.port`.
// Launch an instance of Rocket that handles redirection on `self.port`.
pub async fn try_launch(self, config: Config) -> Result<Rocket<Ignite>, Error> {
rocket::span_info!("HTTP -> HTTPS Redirector" => {
info!(from = self.0, to = config.tls_addr.port(), "redirecting");
Expand Down