Skip to content

Commit 577c50c

Browse files
authored
Merge pull request #3584 from pengqiseven/master
remove repetitive words
2 parents 2dd7be2 + 07ddc77 commit 577c50c

13 files changed

+16
-16
lines changed

text/0458-send-improvements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ This leads us to our second refinement. We add the rule that `&T` is `Send` if
7575
`T` is `Sync`--in other words, we disallow `Send`ing shared references with a
7676
non-threadsafe interior. We do, however, still allow `&mut T` where `T` is `Send`, even
7777
if it is not `Sync`. This is safe because `&mut T` linearizes access--the only way to
78-
access the the original data is through the unique reference, so it is safe to send to other
78+
access the original data is through the unique reference, so it is safe to send to other
7979
threads. Similarly, we allow `&T` where `T` is `Sync`, even if it is not `Send`, since by the definition of `Sync` `&T` is already known to be threadsafe.
8080

8181
Note that this definition of `Send` is identical to the old definition of `Send` when

text/1214-projections-lifetimes-and-wf.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Here, the WF criteria for `DeltaMap<K,V>` are as follows:
259259
- `V: Sized`, because of the implicit `Sized` bound
260260

261261
Let's look at those `K:'a` bounds a bit more closely. If you leave
262-
them out, you will find that the the structure definition above does
262+
them out, you will find that the structure definition above does
263263
not type-check. This is due to the requirement that the types of all
264264
fields in a structure definition must be well-formed. In this case,
265265
the field `base_map` has the type `&'a mut HashMap<K,V>`, and this
@@ -794,7 +794,7 @@ The object type rule is similar, though it includes an extra clause:
794794
R ⊢ O0..On+r WF
795795

796796
The first two clauses here state that the explicit lifetime bound `r`
797-
must be an approximation for the the implicit bounds `rᵢ` derived from
797+
must be an approximation for the implicit bounds `rᵢ` derived from
798798
the trait definitions. That is, if you have a trait definition like
799799

800800
```rust

text/1252-open-options.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ time. No guarantees are made about the order writes end up in the file though.
5656
Note: sadly append-mode is not atomic on NFS filesystems.
5757

5858
One maybe obvious note when using append-mode: make sure that all data that
59-
belongs together, is written the the file in one operation. This can be done
59+
belongs together, is written to the file in one operation. This can be done
6060
by concatenating strings before passing them to `write()`, or using a buffered
6161
writer (with a more than adequately sized buffer) and calling `flush()` when the
6262
message is complete.

text/1721-crt-static.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ the MSVC target with `/MD`, indicating dynamic linkage. Otherwise if the value
193193
is `static` it will compile code with `/MT`, indicating static linkage. Because
194194
today the MSVC targets use dynamic linkage and gcc-rs compiles C code with `/MD`,
195195
gcc-rs will remain forward and backwards compatible with existing and future
196-
Rust MSVC toolchains until such time as the the decision is made to change the
196+
Rust MSVC toolchains until such time as the decision is made to change the
197197
MSVC toolchain to `+crt-static` by default.
198198

199199
### Lazy link attributes

text/1892-uninitialized-uninhabited.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ impl<T> MaybeUninit<T> {
207207
///
208208
/// # Unsafety
209209
///
210-
/// It is up to the caller to guarantee that the the `MaybeUninit` really is in an initialized
210+
/// It is up to the caller to guarantee that the `MaybeUninit` really is in an initialized
211211
/// state, otherwise this will immediately cause undefined behavior.
212212
pub unsafe fn into_inner(self) -> T {
213213
std::ptr::read(&*self.value)
@@ -217,7 +217,7 @@ impl<T> MaybeUninit<T> {
217217
///
218218
/// # Unsafety
219219
///
220-
/// It is up to the caller to guarantee that the the `MaybeUninit` really is in an initialized
220+
/// It is up to the caller to guarantee that the `MaybeUninit` really is in an initialized
221221
/// state, otherwise this will immediately cause undefined behavior.
222222
pub unsafe fn get_ref(&self) -> &T {
223223
&*self.value
@@ -227,7 +227,7 @@ impl<T> MaybeUninit<T> {
227227
///
228228
/// # Unsafety
229229
///
230-
/// It is up to the caller to guarantee that the the `MaybeUninit` really is in an initialized
230+
/// It is up to the caller to guarantee that the `MaybeUninit` really is in an initialized
231231
/// state, otherwise this will immediately cause undefined behavior.
232232
pub unsafe fn get_mut(&mut self) -> &mut T {
233233
&mut *self.value

text/2027-object_safe_for_dispatch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ dispatch.
8383
[how-we-teach-this]: #how-we-teach-this
8484

8585
This is just a slight tweak to how object safety is implemented. We will need
86-
to make sure the the official documentation is accurate to the rules,
86+
to make sure that the official documentation is accurate to the rules,
8787
especially the reference.
8888

8989
However, this does not need to be **highlighted** to users per se in the

text/2044-license-rfcs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This RFC is not authored by a lawyer, so its reasoning may be wrong.
2121
Currently, the Rust RFCs repo is in a state where no clear open source license
2222
is specified.
2323

24-
The current legal base of the the RFCs repo is the "License Grant to Other
24+
The current legal base of the RFCs repo is the "License Grant to Other
2525
Users" from the [Github ToS]`*`:
2626

2727
```

text/2226-fmt-debug-hex.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ This is fixed by [PR #46233](https://github.com/rust-lang/rust/pull/46233).
136136
# Drawbacks
137137
[drawbacks]: #drawbacks
138138

139-
The hexadecimal flag in the the `Debug` trait is superficially redundant
139+
The hexadecimal flag in the `Debug` trait is superficially redundant
140140
with the `LowerHex` and `UpperHex` traits.
141141
If these traits were not stable yet, we could have considered a more unified design.
142142

text/2535-or-patterns.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ following operations (where `a`, `b`, and `c` are arbitrary regexes):
764764
+ Grouping: used to define the scope of what operators apply to.
765765
Commonly written as `(a)`.
766766

767-
Formally, the the minimal formalism we need is:
767+
Formally, the minimal formalism we need is:
768768

769769
```rust
770770
pat : terminal | pat pat | pat "|" pat | "(" pat ")" ;

text/2795-format-args-implicit-identifiers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ There are two types of arguments `format_args!` can accept:
218218

219219
format_args!("The {}'s name is {}.", species, name)
220220

221-
2. Named arguments, which require more typing but (in the RFC author's experience) have the upside that the the format string itself is easier to read:
221+
2. Named arguments, which require more typing but (in the RFC author's experience) have the upside that the format string itself is easier to read:
222222

223223
format_args!(
224224
"The {species}'s name is {name}",

0 commit comments

Comments
 (0)