Skip to content

Commit 0ace46f

Browse files
authored
Rollup merge of #102974 - Rageking8:fix-small-word-dupe-typos, r=JohnTitor
Fix small word dupe typos
2 parents 18b1342 + d1982bd commit 0ace46f

File tree

17 files changed

+21
-21
lines changed

17 files changed

+21
-21
lines changed

compiler/rustc_error_codes/src/error_codes/E0591.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ unsafe {
5353
```
5454

5555
Here, transmute is being used to convert the types of the fn arguments.
56-
This pattern is incorrect because, because the type of `foo` is a function
57-
**item** (`typeof(foo)`), which is zero-sized, and the target type (`fn()`)
56+
This pattern is incorrect because the type of `foo` is a function **item**
57+
(`typeof(foo)`), which is zero-sized, and the target type (`fn()`)
5858
is a function pointer, which is not zero-sized.
5959
This pattern should be rewritten. There are a few possible ways to do this:
6060

compiler/rustc_infer/src/infer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ impl<'tcx> InferCtxt<'tcx> {
12831283
assert!(old_value.is_none());
12841284
}
12851285

1286-
/// Process the region constraints and return any any errors that
1286+
/// Process the region constraints and return any errors that
12871287
/// result. After this, no more unification operations should be
12881288
/// done -- or the compiler will panic -- but it is legal to use
12891289
/// `resolve_vars_if_possible` as well as `fully_resolve`.

library/std/src/io/error/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ fn test_errorkind_packing() {
8686
assert_eq!(Error::from(ErrorKind::NotFound).kind(), ErrorKind::NotFound);
8787
assert_eq!(Error::from(ErrorKind::PermissionDenied).kind(), ErrorKind::PermissionDenied);
8888
assert_eq!(Error::from(ErrorKind::Uncategorized).kind(), ErrorKind::Uncategorized);
89-
// Check that the innards look like like what we want.
89+
// Check that the innards look like what we want.
9090
assert_matches!(
9191
Error::from(ErrorKind::OutOfMemory).repr.data(),
9292
ErrorData::Simple(ErrorKind::OutOfMemory),

library/std/src/sys/unix/kernel_copy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
//! Since those syscalls have requirements that cannot be fully checked in advance and
2121
//! gathering additional information about file descriptors would require additional syscalls
2222
//! anyway it simply attempts to use them one after another (guided by inaccurate hints) to
23-
//! figure out which one works and and falls back to the generic read-write copy loop if none of them
23+
//! figure out which one works and falls back to the generic read-write copy loop if none of them
2424
//! does.
2525
//! Once a working syscall is found for a pair of file descriptors it will be called in a loop
2626
//! until the copy operation is completed.

src/test/ui/async-await/issue-64130-1-sync.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![feature(negative_impls)]
22
// edition:2018
33

4-
// This tests the the specialized async-await-specific error when futures don't implement an
4+
// This tests the specialized async-await-specific error when futures don't implement an
55
// auto trait (which is specifically Sync) due to some type that was captured.
66

77
struct Foo;

src/test/ui/async-await/issue-64130-2-send.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![feature(negative_impls)]
22
// edition:2018
33

4-
// This tests the the specialized async-await-specific error when futures don't implement an
4+
// This tests the specialized async-await-specific error when futures don't implement an
55
// auto trait (which is specifically Send) due to some type that was captured.
66

77
struct Foo;

src/test/ui/async-await/issue-64130-3-other.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#![feature(negative_impls)]
33
// edition:2018
44

5-
// This tests the the unspecialized async-await-specific error when futures don't implement an
5+
// This tests the unspecialized async-await-specific error when futures don't implement an
66
// auto trait (which is not Send or Sync) due to some type that was captured.
77

88
auto trait Qux {}

src/test/ui/const-generics/occurs-check/unused-substs-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![feature(generic_const_exprs)]
22
#![allow(incomplete_features)]
33

4-
// The goal is is to get an unevaluated const `ct` with a `Ty::Infer(TyVar(_#1t)` subst.
4+
// The goal is to get an unevaluated const `ct` with a `Ty::Infer(TyVar(_#1t)` subst.
55
//
66
// If we are then able to infer `ty::Infer(TyVar(_#1t) := Ty<ct>` we introduced an
77
// artificial inference cycle.

src/test/ui/const-generics/occurs-check/unused-substs-3.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![feature(generic_const_exprs)]
22
#![allow(incomplete_features)]
33

4-
// The goal is is to get an unevaluated const `ct` with a `Ty::Infer(TyVar(_#1t)` subst.
4+
// The goal is to get an unevaluated const `ct` with a `Ty::Infer(TyVar(_#1t)` subst.
55
//
66
// If we are then able to infer `ty::Infer(TyVar(_#1t) := Ty<ct>` we introduced an
77
// artificial inference cycle.

src/test/ui/deprecation/deprecation-lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ mod cross_crate {
5151

5252
let _ = nested::DeprecatedTupleStruct (1); //~ ERROR use of deprecated tuple struct `deprecation_lint::nested::DeprecatedTupleStruct`: text
5353

54-
// At the moment, the lint checker only checks stability in
54+
// At the moment, the lint checker only checks stability
5555
// in the arguments of macros.
5656
// Eventually, we will want to lint the contents of the
5757
// macro in the module *defining* it. Also, stability levels

src/test/ui/explain.stdout

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ unsafe {
4747
```
4848

4949
Here, transmute is being used to convert the types of the fn arguments.
50-
This pattern is incorrect because, because the type of `foo` is a function
51-
**item** (`typeof(foo)`), which is zero-sized, and the target type (`fn()`)
50+
This pattern is incorrect because the type of `foo` is a function **item**
51+
(`typeof(foo)`), which is zero-sized, and the target type (`fn()`)
5252
is a function pointer, which is not zero-sized.
5353
This pattern should be rewritten. There are a few possible ways to do this:
5454

src/test/ui/issues/issue-29746.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ macro_rules! zip {
77
zip!([$($rest),*], $a.zip($b), (x,y), [x,y])
88
};
99

10-
// Intermediate steps to build the zipped expression, the match pattern, and
10+
// Intermediate steps to build the zipped expression, the match pattern
1111
// and the output tuple of the closure, using macro hygiene to repeatedly
1212
// introduce new variables named 'x'.
1313
([$a:expr, $($rest:expr),*], $zip:expr, $pat:pat, [$($flat:expr),*]) => {

src/test/ui/issues/issue-75907.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Test for for diagnostic improvement issue #75907
1+
// Test for diagnostic improvement issue #75907
22

33
mod foo {
44
pub(crate) struct Foo(u8);

src/test/ui/issues/issue-75907_b.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Test for for diagnostic improvement issue #75907, extern crate
1+
// Test for diagnostic improvement issue #75907, extern crate
22
// aux-build:issue-75907.rs
33

44
extern crate issue_75907 as a;

src/test/ui/lint/lint-stability-deprecated.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ mod cross_crate {
130130
let _ = UnstableTupleStruct (1);
131131
let _ = StableTupleStruct (1);
132132

133-
// At the moment, the lint checker only checks stability in
133+
// At the moment, the lint checker only checks stability
134134
// in the arguments of macros.
135135
// Eventually, we will want to lint the contents of the
136136
// macro in the module *defining* it. Also, stability levels

src/test/ui/proc-macro/meta-macro-hygiene.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ macro_rules! produce_it {
1919
// `print_def_site!` will respan the `$crate` identifier
2020
// with `Span::def_site()`. This should cause it to resolve
2121
// relative to `meta_macro`, *not* `make_macro` (despite
22-
// the fact that that `print_def_site` is produced by
23-
// a `macro_rules!` macro in `make_macro`).
22+
// the fact that `print_def_site` is produced by a
23+
// `macro_rules!` macro in `make_macro`).
2424
meta_macro::print_def_site!($crate::dummy!());
2525
}
2626
}

src/test/ui/proc-macro/meta-macro-hygiene.stdout

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ macro_rules! produce_it
3535
// `print_def_site!` will respan the `$crate` identifier
3636
// with `Span::def_site()`. This should cause it to resolve
3737
// relative to `meta_macro`, *not* `make_macro` (despite
38-
// the fact that that `print_def_site` is produced by
39-
// a `macro_rules!` macro in `make_macro`).
38+
// the fact that `print_def_site` is produced by a
39+
// `macro_rules!` macro in `make_macro`).
4040
}
4141
}
4242

0 commit comments

Comments
 (0)