Skip to content

Commit

Permalink
Auto merge of rust-lang#134729 - oliveredget:typo, r=jieyouxu
Browse files Browse the repository at this point in the history
chore: fix typos

Fix some typos, thank you very much.
  • Loading branch information
bors committed Dec 25, 2024
2 parents a92c3cf + be1d5dd commit e33c428
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion library/core/src/macros/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,7 @@ pub(crate) mod builtin {
/// NAME is a string that represents a valid function name.
/// MODE is any of Forward, Reverse, ForwardFirst, ReverseFirst.
/// INPUT_ACTIVITIES consists of one valid activity for each input parameter.
/// OUTPUT_ACTIVITY must not be set if we implicitely return nothing (or explicitely return
/// OUTPUT_ACTIVITY must not be set if we implicitly return nothing (or explicitly return
/// `-> ()`). Otherwise it must be set to one of the allowed activities.
#[unstable(feature = "autodiff", issue = "124509")]
#[allow_internal_unstable(rustc_attrs)]
Expand Down
4 changes: 2 additions & 2 deletions library/core/src/str/lossy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ impl [u8] {
/// Creates an iterator over the contiguous valid UTF-8 ranges of this
/// slice, and the non-UTF-8 fragments in between.
///
/// See the [`Utf8Chunk`] type for documenation of the items yielded by this iterator.
/// See the [`Utf8Chunk`] type for documentation of the items yielded by this iterator.
///
/// # Examples
///
Expand Down Expand Up @@ -150,7 +150,7 @@ impl fmt::Debug for Debug<'_> {
/// If you want a simple conversion from UTF-8 byte slices to string slices,
/// [`from_utf8`] is easier to use.
///
/// See the [`Utf8Chunk`] type for documenation of the items yielded by this iterator.
/// See the [`Utf8Chunk`] type for documentation of the items yielded by this iterator.
///
/// [byteslice]: slice
/// [`from_utf8`]: super::from_utf8
Expand Down
2 changes: 1 addition & 1 deletion library/core/tests/iter/adapters/take.rs
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ fn test_reverse_on_zip() {

let zipped_iter = vec_1.iter().zip(core::iter::repeat(0).take(20));

// Cannot call rev here for automatic reversed zip constuction
// Cannot call rev here for automatic reversed zip construction
for (&one, zero) in zipped_iter.rev() {
assert_eq!((1, 0), (one, zero));
}
Expand Down
2 changes: 1 addition & 1 deletion src/tools/compiletest/src/read2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ impl ProcOutput {
.count();
*filtered_len -= matches * path_bytes.len();

// We can't just remove the length of the filtered path from the output lenght,
// We can't just remove the length of the filtered path from the output length,
// otherwise a compiler emitting only filtered paths would OOM compiletest. Add
// a fixed placeholder length for each path to prevent that.
*filtered_len += matches * FILTERED_PATHS_PLACEHOLDER_LEN;
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/traits/non_lifetime_binders/basic.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//@ check-pass
// Basic test that show's we can succesfully typeck a `for<T>` where clause.
// Basic test that show's we can successfully typeck a `for<T>` where clause.

#![feature(non_lifetime_binders)]
//~^ WARN the feature `non_lifetime_binders` is incomplete
Expand Down

0 comments on commit e33c428

Please sign in to comment.