Skip to content

Commit

Permalink
Unrolled build for rust-lang#121495
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#121495 - cuishuang:master, r=clubby789

remove repetitive words
  • Loading branch information
rust-timer authored Feb 23, 2024
2 parents b6a23b8 + 824d75c commit ace9382
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_ssa/src/back/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ pub fn create_compressed_metadata_file_for_xcoff(
/// that contains a custom section of the name `section_name` with contents
/// `data`.
///
/// NB: the `object` crate does not yet have support for writing the the wasm
/// NB: the `object` crate does not yet have support for writing the wasm
/// object file format. The format is simple enough that for now an extra crate
/// from crates.io (such as `wasm-encoder`). The file format is:
///
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_middle/src/traits/select.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ pub enum SelectionCandidate<'tcx> {
/// generated for an `async ||` expression.
AsyncClosureCandidate,

/// Implementation of the the `AsyncFnKindHelper` helper trait, which
/// Implementation of the `AsyncFnKindHelper` helper trait, which
/// is used internally to delay computation for async closures until after
/// upvar analysis is performed in HIR typeck.
AsyncFnKindHelperCandidate,
Expand Down
12 changes: 6 additions & 6 deletions library/alloc/src/collections/btree/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2916,7 +2916,7 @@ impl<'a, K, V> Cursor<'a, K, V> {
}
}

/// Returns a reference to the the key and value of the next element without
/// Returns a reference to the key and value of the next element without
/// moving the cursor.
///
/// If the cursor is at the end of the map then `None` is returned
Expand All @@ -2925,7 +2925,7 @@ impl<'a, K, V> Cursor<'a, K, V> {
self.clone().next()
}

/// Returns a reference to the the key and value of the previous element
/// Returns a reference to the key and value of the previous element
/// without moving the cursor.
///
/// If the cursor is at the start of the map then `None` is returned.
Expand Down Expand Up @@ -2958,7 +2958,7 @@ impl<'a, K, V, A> CursorMut<'a, K, V, A> {
Some((&*k, v))
}

/// Returns a reference to the the key and value of the next element without
/// Returns a reference to the key and value of the next element without
/// moving the cursor.
///
/// If the cursor is at the end of the map then `None` is returned
Expand All @@ -2968,7 +2968,7 @@ impl<'a, K, V, A> CursorMut<'a, K, V, A> {
Some((&*k, v))
}

/// Returns a reference to the the key and value of the previous element
/// Returns a reference to the key and value of the previous element
/// without moving the cursor.
///
/// If the cursor is at the start of the map then `None` is returned.
Expand Down Expand Up @@ -3056,7 +3056,7 @@ impl<'a, K, V, A> CursorMutKey<'a, K, V, A> {
}
}

/// Returns a reference to the the key and value of the next element without
/// Returns a reference to the key and value of the next element without
/// moving the cursor.
///
/// If the cursor is at the end of the map then `None` is returned
Expand All @@ -3068,7 +3068,7 @@ impl<'a, K, V, A> CursorMutKey<'a, K, V, A> {
Some(kv)
}

/// Returns a reference to the the key and value of the previous element
/// Returns a reference to the key and value of the previous element
/// without moving the cursor.
///
/// If the cursor is at the start of the map then `None` is returned.
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/config/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2399,7 +2399,7 @@ impl Config {
.last_modified_commit(&["src/llvm-project"], "download-ci-llvm", true)
.is_none()
{
// there are some untracked changes in the the given paths.
// there are some untracked changes in the given paths.
false
} else {
llvm::is_ci_llvm_available(self, asserts)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,5 @@ render differently in this case:
[f]: g
```

`1.` and `2.` will will be displayed as is in the rendered documentation (ie, `[a]` and `[b][c]`)
`1.` and `2.` will be displayed as is in the rendered documentation (ie, `[a]` and `[b][c]`)
whereas `3.` and `4.` will be replaced by a link targetting `e` for `[d](e)` and `g` for `[f]`.

0 comments on commit ace9382

Please sign in to comment.