Skip to content

Commit 35e77b8

Browse files
JohnEndsontshepang
JohnEndson
authored andcommitted
Fix some comments
Signed-off-by: JohnEndson <[email protected]>
1 parent 1ddb90c commit 35e77b8

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Diff for: src/borrow_check/opaque-types-region-inference-restrictions.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Example of case (1):
1919
```rust
2020
type Opaque<X> = impl Sized;
2121

22-
// `T` is a type paramter.
22+
// `T` is a type parameter.
2323
// Opaque<T> := ();
2424
fn good<T>() -> Opaque<T> {}
2525

@@ -42,7 +42,7 @@ fn bad<T>(t: T) -> Opaque<T, T> { t } //~ ERROR
4242
```
4343
**Motivation:** In the first case `Opaque<()> := ()`, the hidden type is ambiguous because
4444
it is compatible with two different interpretaions: `Opaque<X> := X` and `Opaque<X> := ()`.
45-
Similarily for the second case `Opaque<T, T> := T`, it is ambiguous whether it should be
45+
Similarly for the second case `Opaque<T, T> := T`, it is ambiguous whether it should be
4646
interpreted as `Opaque<X, Y> := X` or as `Opaque<X, Y> := Y`.
4747
Because of this ambiguity, both cases are rejected as invalid defining uses.
4848

Diff for: src/building/suggested.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ let
303303
''
304304
pkgs.mkShell {
305305
/* ... */
306-
# This environment varaible tells bootstrap where our config.toml is.
306+
# This environment variable tells bootstrap where our config.toml is.
307307
RUST_BOOTSTRAP_CONFIG = config;
308308
}
309309
```

Diff for: src/git.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ error: Please commit or stash them.
170170
(See <https://git-scm.com/book/en/v2/Getting-Started-What-is-Git%3F#_the_three_states> for the difference between the two.)
171171

172172
This means you have made changes since the last time you made a commit. To be able to rebase, either
173-
commit your changes, or make a temporary commit called a "stash" to have them still not be commited
173+
commit your changes, or make a temporary commit called a "stash" to have them still not be committed
174174
when you finish rebasing. You may want to configure git to make this "stash" automatically, which
175175
will prevent the "cannot rebase" error in nearly all cases:
176176

Diff for: src/solve/invariants.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ a few of them do not hold in Rust right now. This is either a fundamental to its
88
caused by bugs and something that may change in the future.
99

1010
It is important to know about the things you can assume while working on - and with - the
11-
type system, so here's an incomplete and inofficial list of invariants of
11+
type system, so here's an incomplete and unofficial list of invariants of
1212
the core type system:
1313

1414
- ✅: this invariant mostly holds, with some weird exceptions, you can rely on it outside

Diff for: src/what-does-early-late-bound-mean.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ closure type. Closures are [currently unsound](https://github.com/rust-lang/rust
7373
ways that are closely related to the distinction between early/late bound
7474
parameters (more on this later)
7575

76-
The early/late boundness of generic parameters is only relevent for the desugaring of
76+
The early/late boundness of generic parameters is only relevant for the desugaring of
7777
functions/closures into types with builtin `Fn*` impls. It does not make sense to talk about
7878
in other contexts.
7979

0 commit comments

Comments
 (0)