Skip to content

Commit

Permalink
Auto merge of #10639 - catandcoder:master, r=ehuss
Browse files Browse the repository at this point in the history
fix some typos
  • Loading branch information
bors committed May 7, 2022
2 parents 9c61a3d + 6f13c46 commit 7ed2769
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/testsuite/cargo_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ error: no such subcommand: `C`
}

#[cargo_test]
fn find_closest_captial_b_to_b() {
fn find_closest_capital_b_to_b() {
cargo_process("B")
.with_status(101)
.with_stderr_contains(
Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl ConfigBuilder {
self
}

/// Unconditionaly enable nightly features, even on stable channels.
/// Unconditionally enable nightly features, even on stable channels.
pub fn nightly_features_allowed(&mut self, allowed: bool) -> &mut Self {
self.enable_nightly_features = allowed;
self
Expand Down Expand Up @@ -1128,7 +1128,7 @@ unstable.print-im-a-teapot = true
}

#[cargo_test]
/// Assert that atempting to set an unstable flag that doesn't exist via config
/// Assert that attempting to set an unstable flag that doesn't exist via config
/// is ignored on stable
fn unstable_invalid_flag_ignored_on_stable() {
write_config(
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/future_incompat_report.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ fn test_single_crate() {
write_config_toml("");
check_has_future_compat();

// Check that we show a message with `frequence = "always"`
// Check that we show a message with `frequency = "always"`
write_config_toml(
"\
[future-incompat-report]
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/pkgid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Caused by:
)
.run();

// Bad file URL with simliar name.
// Bad file URL with similar name.
p.cargo("pkgid './cratesio'")
.with_status(101)
.with_stderr(
Expand Down

0 comments on commit 7ed2769

Please sign in to comment.