Skip to content

Commit a035f1e

Browse files
committed
Fix typos in RFCs 1751-2000
1 parent d4fe338 commit a035f1e

13 files changed

+23
-23
lines changed

text/1824-crates.io-default-ranking.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ A few assumptions we made:
7474
## Order by recent downloads
7575

7676
Through the iterations of this RFC, there was no consensus around a way to order
77-
crates that would be useful, understandable, resistent to being gamed, and not
77+
crates that would be useful, understandable, resistant to being gamed, and not
7878
require work of curators, reviewers, or moderators. Furthermore, different
7979
people in different situations may value different aspects of crates.
8080

@@ -272,7 +272,7 @@ These would be displayed as badges on lists of crates.
272272

273273
These levels would not have any time commitments attached to them-- maintainers
274274
who would like to batch changes into releases every 6 months could report
275-
"actively developed" just as much as mantainers who like to release every 6
275+
"actively developed" just as much as maintainers who like to release every 6
276276
weeks. This would need to be clearly communicated to set crate user
277277
expectations properly.
278278

text/1828-rust-bookshelf.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,18 @@ book will run when developers do `x.py check`. This is similar to how, today,
7373
Traivs runs a subset of the tests, but buildbot runs all of them.
7474

7575
The landing page on doc.rust-lang.org will show off the full bookshelf, to let
76-
people find the documenation they need. It will also link to their respective
76+
people find the documentation they need. It will also link to their respective
7777
repositories.
7878

7979
Finally, this creates a path for more books in the future: "the FFI Book" would
8080
be one example of a possibility for this kind of thing. The docs team will
81-
develop critera for accepting a book as part of the official project.
81+
develop criteria for accepting a book as part of the official project.
8282

8383
# How We Teach This
8484
[how-we-teach-this]: #how-we-teach-this
8585

8686
The landing page on doc.rust-lang.org will show off the full bookshelf, to let
87-
people find the documenation they need. It will also link to their respective
87+
people find the documentation they need. It will also link to their respective
8888
repositories.
8989

9090
# Drawbacks

text/1845-shared-from-slice.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Providing these implementations in the current state of Rust requires substantia
7474

7575
## [`RcBox`][RcBox] is not public
7676

77-
Furthermore, since [`RcBox`][RcBox] is not exposed publically from [`std::rc`][std::rc], one can't make an implementation outside of the standard library for this without making assumptions about the internal layout of [`Rc`][Rc]. The alternative is to roll your own implementation of [`Rc`][Rc] in its entirity - but this in turn requires using a lot of feature gates, which makes using this on stable Rust in the near future unfeasible.
77+
Furthermore, since [`RcBox`][RcBox] is not exposed publicly from [`std::rc`][std::rc], one can't make an implementation outside of the standard library for this without making assumptions about the internal layout of [`Rc`][Rc]. The alternative is to roll your own implementation of [`Rc`][Rc] in its entirety - but this in turn requires using a lot of feature gates, which makes using this on stable Rust in the near future unfeasible.
7878

7979
## For [`Arc`][Arc]
8080

@@ -479,7 +479,7 @@ The main drawback would be increasing the size of the standard library.
479479

480480
1. Only implement this for [`T: Copy`][Copy] and skip [`T: Clone`][Clone].
481481
2. Let other libraries do this. This has the problems explained in the [motivation]
482-
section above regarding [`RcBox`][RcBox] not being publically exposed as well as
482+
section above regarding [`RcBox`][RcBox] not being publicly exposed as well as
483483
the amount of feature gates needed to roll ones own [`Rc`][Rc] alternative - for
484484
little gain.
485485
3. Only implement this for [`Rc`][Rc] and skip it for [`Arc`][Arc].

text/1857-stabilize-drop-order.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ code (which could rely on the new drop order).
4444

4545
Both requirements seem quite difficult, if not impossible, to meet. Even in case
4646
we figured out how to meet those requirements, the complexity of the approach would
47-
probably outweight the current complexity of having a non-intuitive drop order.
47+
probably outweigh the current complexity of having a non-intuitive drop order.
4848

4949
Finally, in case people really dislike the current drop order, it may still
5050
be possible to introduce alternative, opt-in, drop orders in a backwards

text/1859-try-trait.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ and hence could be changed back to be more in line with this RFC.)
7575

7676
The existing `try!` macro and `?` operator already allow a limit
7777
amount of type conversion, specifically in the error case. That is, if
78-
you apply `?` to a value of type `Result<T, E>`, the surrouding
78+
you apply `?` to a value of type `Result<T, E>`, the surrounding
7979
function can have some other return type `Result<U, F>`, so long as
8080
the error types are related by the `From` trait (`F: From<E>`). The
8181
idea is that if an error occurs, we will wind up returning
@@ -119,7 +119,7 @@ help ensure that "accidental" interconversion does not occur.
119119
### Playground
120120

121121
Note: if you wish to experiment,
122-
[this Rust playgroud link](https://play.rust-lang.org/?gist=9ef8effa0c1c81bc8bb8dccb07505c54&version=stable&backtrace=0)
122+
[this Rust playground link](https://play.rust-lang.org/?gist=9ef8effa0c1c81bc8bb8dccb07505c54&version=stable&backtrace=0)
123123
contains the traits and impls defined herein.
124124

125125
### Desugaring and the `Try` trait

text/1884-unstable-sort.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ assert!(v == [1, 2, -3, 4, -5]);
123123

124124
### Implementation
125125

126-
Proposed implementaton is available in the [pdqsort][stjepang-pdqsort] crate.
126+
Proposed implementation is available in the [pdqsort][stjepang-pdqsort] crate.
127127

128128
**Q: Why choose this particular sort algorithm?**<br>
129129
A: First, let's analyse what unstable sort algorithms other languages use:

text/1892-uninitialized-uninhabited.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@ actually unsafe - where we have to assert to the compiler that we have a valid
146146
value. And we only ever tell the compiler we have a value of type `T` where we
147147
know we actually do have a value of type `T`. As such, this is fine to use with
148148
any `T`, including `!`. If the callback diverges then it's not possible to get
149-
to the `unsafe` block and try to read the non-existant value.
149+
to the `unsafe` block and try to read the non-existent value.
150150

151-
Given that it's so easy for code using `uninitialzed` to hide bugs like this,
151+
Given that it's so easy for code using `uninitialized` to hide bugs like this,
152152
and given that there's a better alternative, this RFC proposes deprecating
153153
`uninitialized` and introducing the `MaybeUninit` type into the standard
154154
library as a replacement.

text/1909-unsized-rvalues.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,14 +189,14 @@ pub trait Clone {
189189
}
190190
```
191191

192-
That would be a backwards-compatability-breaking change, because today `T: Clone + ?Sized` (or of course `Self: Clone` in a trait context, with no implied `Self: Sized`) implies that `T: Sized`, but it might be that its impact is small enough to allow (and even if not, it might be worth it for Rust 2.0).
192+
That would be a backwards-compatibility-breaking change, because today `T: Clone + ?Sized` (or of course `Self: Clone` in a trait context, with no implied `Self: Sized`) implies that `T: Sized`, but it might be that its impact is small enough to allow (and even if not, it might be worth it for Rust 2.0).
193193

194194
# Unresolved questions
195195
[unresolved]: #unresolved-questions
196196

197197
How can we mitigate the risk of unintended unsized or large allocas? Note that the problem already exists today with large structs/arrays. A MIR lint against large/variable stack sizes would probably help users avoid these stack overflows. Do we want it in Clippy? rustc?
198198

199-
How do we handle truely-unsized DSTs when we get them? They can theoretically be passed to functions, but they can never be put in temporaries.
199+
How do we handle truly-unsized DSTs when we get them? They can theoretically be passed to functions, but they can never be put in temporaries.
200200

201201
Accumulative allocas (aka `'fn` borrows) are beyond the scope of this RFC.
202202

text/1966-unsafe-pointer-reform.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ However these static functions are fairly cumbersome in the common case, where y
5353

5454
## Signed Offset
5555

56-
The cast in `ptr.offset(idx as isize)` is unnecessarily annoying. Idiomatic Rust code uses unsigned offsets, but low level code is forced to constantly cast those offsets. To understand why this interface is designed as it is, some background is neeeded.
56+
The cast in `ptr.offset(idx as isize)` is unnecessarily annoying. Idiomatic Rust code uses unsigned offsets, but low level code is forced to constantly cast those offsets. To understand why this interface is designed as it is, some background is needed.
5757

5858
`offset` is directly exposing LLVM's `getelementptr` instruction, with the `inbounds` keyword. `wrapping_offset` removes the `inbounds` keyword. `offset` takes a signed integer, because that's what GEP exposes. It's understandable that we've been conservative here; GEP is so confusing that it has an [entire FAQ](http://llvm.org/docs/GetElementPtr.html).
5959

text/1969-cargo-prepublish.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ section! For example these two sections are equivalent:
339339
log = { git = 'https://github.com/rust-lang-nursery/log' }
340340
```
341341

342-
This is not accidental! The intial development of the `[patch]` feature was
342+
This is not accidental! The initial development of the `[patch]` feature was
343343
actually focused on prepublishing dependencies and was called `[prepublish]`,
344344
but while discussing it a conclusion was reached that `[prepublish]` already
345345
allowed replacing existing versions in a registry, but issued a warning when
@@ -368,7 +368,7 @@ The mechanism itself is straightforward enough that a handful of examples (as in
368368
this RFC) is generally enough to explain it. In the docs, these examples should
369369
be spelled out in greater detail.
370370

371-
Most notably, however, the [overriding dependenices][over] section of Cargo's
371+
Most notably, however, the [overriding dependencies][over] section of Cargo's
372372
documentation will be rewritten to primarily mention `[patch]`, but
373373
`[replace]` will be mentioned still with a recommendation to use `[patch]`
374374
instead if possible.

0 commit comments

Comments
 (0)