Skip to content

Commit

Permalink
Unrolled build for rust-lang#134971
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#134971 - dxsullivan:fix-typo, r=lqd

chore: fix typos

I hope my typo corrections will help you. Thank you for your work.
  • Loading branch information
rust-timer authored Jan 1, 2025
2 parents 4e59b1d + bb16267 commit e70e456
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/rustdoc/type-alias/deeply-nested-112515.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Regression test for <https://github.com/rust-lang/rust/issues/112515>.
// It's to ensure that this code doesn't have infinite loop in rustdoc when
// trying to retrive type alias implementations.
// trying to retrieve type alias implementations.

// ignore-tidy-linelength

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Here, there are two types with the same name. One of these has a `derive` annotation, but in the
// expansion these `impl`s are associated to the the *other* type. There is a suggestion to remove
// unneded type parameters, but because we're now point at a type with no type parameters, the
// unneeded type parameters, but because we're now point at a type with no type parameters, the
// suggestion would suggest removing code from an empty span, which would ICE in nightly.
//
// issue: rust-lang/rust#108748
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// E0116 caused other unrelated errors, so check no unrelated errors are emmitted.
// E0116 caused other unrelated errors, so check no unrelated errors are emitted.

fn main() {
let x = "hello";
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/indexing/indexing-spans-caller-location.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ impl std::ops::Index<usize> for A {
type Output = ();

fn index(&self, _idx: usize) -> &() {
// Use the relative number to make it resistent to header changes.
// Use the relative number to make it resistant to header changes.
assert_eq!(caller_line(), self.prev_line + 2);
&()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

// Regression test for #107745.
// Previously need_type_info::update_infer_source will consider expressions originating from
// macro expressions as candiate "previous sources". This unfortunately can mean that
// macro expressions as candidate "previous sources". This unfortunately can mean that
// for macros expansions such as `format!()` internal implementation details can leak, such as:
//
// ```
Expand Down

0 comments on commit e70e456

Please # to comment.