diff --git a/src/borrow_check/opaque-types-region-inference-restrictions.md b/src/borrow_check/opaque-types-region-inference-restrictions.md index ff76c302..3bf4db35 100644 --- a/src/borrow_check/opaque-types-region-inference-restrictions.md +++ b/src/borrow_check/opaque-types-region-inference-restrictions.md @@ -19,7 +19,7 @@ Example of case (1): ```rust type Opaque = impl Sized; -// `T` is a type paramter. +// `T` is a type parameter. // Opaque := (); fn good() -> Opaque {} @@ -42,7 +42,7 @@ fn bad(t: T) -> Opaque { t } //~ ERROR ``` **Motivation:** In the first case `Opaque<()> := ()`, the hidden type is ambiguous because it is compatible with two different interpretaions: `Opaque := X` and `Opaque := ()`. -Similarily for the second case `Opaque := T`, it is ambiguous whether it should be +Similarly for the second case `Opaque := T`, it is ambiguous whether it should be interpreted as `Opaque := X` or as `Opaque := Y`. Because of this ambiguity, both cases are rejected as invalid defining uses. diff --git a/src/building/suggested.md b/src/building/suggested.md index 04829f69..304e5acb 100644 --- a/src/building/suggested.md +++ b/src/building/suggested.md @@ -303,7 +303,7 @@ let '' pkgs.mkShell { /* ... */ - # This environment varaible tells bootstrap where our config.toml is. + # This environment variable tells bootstrap where our config.toml is. RUST_BOOTSTRAP_CONFIG = config; } ``` diff --git a/src/git.md b/src/git.md index 27d26e28..3d564278 100644 --- a/src/git.md +++ b/src/git.md @@ -170,7 +170,7 @@ error: Please commit or stash them. (See for the difference between the two.) This means you have made changes since the last time you made a commit. To be able to rebase, either -commit your changes, or make a temporary commit called a "stash" to have them still not be commited +commit your changes, or make a temporary commit called a "stash" to have them still not be committed when you finish rebasing. You may want to configure git to make this "stash" automatically, which will prevent the "cannot rebase" error in nearly all cases: diff --git a/src/solve/invariants.md b/src/solve/invariants.md index 75ae5307..a28c9ecb 100644 --- a/src/solve/invariants.md +++ b/src/solve/invariants.md @@ -8,7 +8,7 @@ a few of them do not hold in Rust right now. This is either a fundamental to its caused by bugs and something that may change in the future. It is important to know about the things you can assume while working on - and with - the -type system, so here's an incomplete and inofficial list of invariants of +type system, so here's an incomplete and unofficial list of invariants of the core type system: - ✅: this invariant mostly holds, with some weird exceptions, you can rely on it outside diff --git a/src/what-does-early-late-bound-mean.md b/src/what-does-early-late-bound-mean.md index 9a6a0b13..cde9074f 100644 --- a/src/what-does-early-late-bound-mean.md +++ b/src/what-does-early-late-bound-mean.md @@ -73,7 +73,7 @@ closure type. Closures are [currently unsound](https://github.com/rust-lang/rust ways that are closely related to the distinction between early/late bound parameters (more on this later) -The early/late boundness of generic parameters is only relevent for the desugaring of +The early/late boundness of generic parameters is only relevant for the desugaring of functions/closures into types with builtin `Fn*` impls. It does not make sense to talk about in other contexts.