Skip to content

Commit 089e1f3

Browse files
authored
Merge pull request #3277 from jhpratt/fix-typos
Fix typos
2 parents e68eb8f + 590ec4b commit 089e1f3

File tree

152 files changed

+291
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+291
-291
lines changed

compiler_changes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ submitted later if there is scope for large changes to the language RFC.
2828
* Adding, removing, or changing a stable compiler flag
2929
* The implementation of new language features where there is significant change
3030
or addition to the compiler. There is obviously some room for interpretation
31-
about what consitutes a "significant" change and how much detail the
31+
about what constitutes a "significant" change and how much detail the
3232
implementation RFC needs. For guidance, [associated items](text/0195-associated-items.md)
3333
and [UFCS](text/0132-ufcs.md) would clearly need an implementation RFC,
3434
[type ascription](text/0803-type-ascription.md) and
@@ -41,7 +41,7 @@ submitted later if there is scope for large changes to the language RFC.
4141

4242
* Bug fixes, improved error messages, etc.
4343
* Minor refactoring/tidying up
44-
* Implmenting language features which have an accepted RFC, where the
44+
* Implementing language features which have an accepted RFC, where the
4545
implementation does not significantly change the compiler or require
4646
significant new design work
4747
* Adding unstable API for tools (note that all compiler API is currently unstable)

libs_changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ as `std` has become more conservative in favour of the much more agile cargovers
7676
* Too marginal for std
7777
* Significant implementation problems
7878

79-
* A PR may also be closed because an RFC is approriate.
79+
* A PR may also be closed because an RFC is appropriate.
8080

8181
* A (non-RFC) PR may be **merged as unstable**. In this case, the feature
8282
should have a fresh feature gate and an associated tracking issue for

style-guide/expressions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ Examples:
643643
```rust
644644
match foo {
645645
foo => bar,
646-
a_very_long_patten | another_pattern if an_expression() => {
646+
a_very_long_pattern | another_pattern if an_expression() => {
647647
no_room_for_this_expression()
648648
}
649649
foo => {

text/0019-opt-in-builtin-traits.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ opt-in. There are two main reasons for my concern:
7171

7272
To elaborate on those two points: With respect to parallelization: for
7373
the most part, Rust types are threadsafe "by default". To make
74-
something non-threadsafe, you must employ unsychronized interior
75-
mutability (e.g., `Cell`, `RefCell`) or unsychronized shared ownership
74+
something non-threadsafe, you must employ unsynchronized interior
75+
mutability (e.g., `Cell`, `RefCell`) or unsynchronized shared ownership
7676
(`Rc`). In both cases, there are also synchronized variants available
7777
(`Mutex`, `Arc`, etc). This implies that we can make APIs to enable
7878
intra-task parallelism and they will work ubiquitously, so long as
@@ -116,7 +116,7 @@ All three of these (`Snapshot`, `NoManaged`, `NoDrop`) can be easily
116116
defined using traits with default impls.
117117

118118
A final, somewhat weaker, motivator is aesthetics. Ownership has allowed
119-
us to move threading almost entirely into libaries. The one exception
119+
us to move threading almost entirely into libraries. The one exception
120120
is that the `Send` and `Share` types remain built-in. Opt-in traits
121121
makes them *less* built-in, but still requires custom logic in the
122122
"impl matching" code as well as special safety checks when

text/0040-libstd-facade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ algorithms apart from the default sorting algorithm.
164164
#### FromStr
165165

166166
This trait and module are left out because strings are left out. All types in
167-
libmini can have their implemention of FromStr in the crate which implements
167+
libmini can have their implementation of FromStr in the crate which implements
168168
strings
169169

170170
#### Floats

text/0048-traits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ Note that there is some interaction with the distinction between input
231231
and output type parameters discussed in the previous
232232
example. Specifically, we must never *infer* the value of the `Self`
233233
type parameter based on the impls in scope. This is because it would
234-
cause *crate concatentation* to potentially lead to compilation errors
234+
cause *crate concatenation* to potentially lead to compilation errors
235235
in the form of inference failure.
236236

237237
## Properties
@@ -242,7 +242,7 @@ There are important properties I would like to guarantee:
242242
values for all of its type parameters, there should always be at
243243
most one applicable impl. This should remain true even when unknown,
244244
additional crates are loaded.
245-
- **Crate concatentation:** It should always be possible to take two
245+
- **Crate concatenation:** It should always be possible to take two
246246
creates and combine them without causing compilation errors. This
247247
property
248248

text/0155-anonymous-impl-only-in-same-module.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ and methods of a struct should be defined nearby.
101101
I propose three changes to the language:
102102

103103
- `impl` on multiple-ident paths such as `impl mymod::MyStruct` is disallowed.
104-
Since this currently suprises the user by having absolutely no effect for
104+
Since this currently surprises the user by having absolutely no effect for
105105
static methods, support for this is already broken.
106106
- `impl MyStruct` must occur in the same module that `MyStruct` is defined.
107107
This is to prevent the above problems with `impl`-across-modules.

text/0169-use-path-as-id.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Summary
66

77
Change the rebinding syntax from `use ID = PATH` to `use PATH as ID`,
8-
so that paths all line up on the left side, and imported identifers
8+
so that paths all line up on the left side, and imported identifiers
99
are all on the right side. Also modify `extern crate` syntax
1010
analogously, for consistency.
1111

text/0194-cfg-syntax.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ proposed names read better with the function-like syntax and are consistent
8585
with `Iterator::all` and `Iterator::any`.
8686

8787
Issue [#2119](https://github.com/rust-lang/rust/issues/2119) proposed the
88-
addition of `||` and `&&` operators and parantheses to the attribute syntax
88+
addition of `||` and `&&` operators and parentheses to the attribute syntax
8989
to result in something like `#[cfg(a || (b && c)]`. I don't favor this proposal
9090
since it would result in a major change to the attribute syntax for relatively
9191
little readability gain.

text/0195-associated-items.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ impl<'a, T> Sliceable for &'a Vec<T> {
12631263
But then there's a difficult question:
12641264

12651265
```
1266-
fn dice<A>(a: &A) -> &A::Slice where &A: Slicable {
1266+
fn dice<A>(a: &A) -> &A::Slice where &A: Sliceable {
12671267
a // is this allowed?
12681268
}
12691269
```

0 commit comments

Comments
 (0)