Skip to content

Commit

Permalink
Auto merge of #13216 - rustaceanclub:master, r=epage
Browse files Browse the repository at this point in the history
Remove repetitive words
  • Loading branch information
bors committed Dec 29, 2023
2 parents 312ad26 + 5c7fbd8 commit 04b6aed
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion credential/cargo-credential/examples/stdout-redirected.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl Credential for MyCredential {
_args: &[&str],
) -> Result<CredentialResponse, Error> {
// Informational messages should be sent on stderr.
eprintln!("message on stderr should be sent the the parent process");
eprintln!("message on stderr should be sent to the parent process");

// Reading from stdin and writing to stdout will go to the attached console (tty).
println!("message from test credential provider");
Expand Down
2 changes: 1 addition & 1 deletion credential/cargo-credential/tests/examples.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ fn stdout_redirected() {
.arg("--cargo-plugin")
.assert()
.stdout_eq(format!("{hello}\n{err_not_supported}\n"))
.stderr_eq("message on stderr should be sent the the parent process\n")
.stderr_eq("message on stderr should be sent to the parent process\n")
.success();
}

Expand Down
2 changes: 1 addition & 1 deletion src/cargo/sources/registry/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ pub enum LoadResponse {
NotFound,
}

/// An abstract interface to handle both a local and and remote registry.
/// An abstract interface to handle both a local and remote registry.
///
/// This allows [`RegistrySource`] to abstractly handle each registry kind.
///
Expand Down
2 changes: 1 addition & 1 deletion src/doc/src/reference/specifying-dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ separated with a comma, e.g., `>= 1.2, < 1.5`.
> (e.g. only uses a simple type that hasn't changed between releases, like an `Id`)
> may support users choosing which version of the "public dependency" to use.
> In this case, a version requirement like `">=0.4, <2"` may be of interest.
> *However* users of the package will likely run into errors and need to to
> *However* users of the package will likely run into errors and need to
> manually select a version of the "public dependency" via `cargo update` if
> they also depend on it as Cargo might pick different versions of the "public
> dependency" when [resolving dependency versions](resolver.md) (see
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/global_cache_tracker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ fn auto_gc_index() {
fn auto_gc_git() {
// auto-gc should delete git checkouts and dbs.

// Returns the short git name of a a checkout.
// Returns the short git name of a checkout.
let short_id = |repo: &git2::Repository| -> String {
let head = repo.revparse_single("HEAD").unwrap();
let short_id = head.short_id().unwrap();
Expand Down

0 comments on commit 04b6aed

Please sign in to comment.