diff --git a/src/doc/trpl/enums.md b/src/doc/trpl/enums.md index 80ea25eb35ce9..dade9044fdbe8 100644 --- a/src/doc/trpl/enums.md +++ b/src/doc/trpl/enums.md @@ -56,7 +56,8 @@ Character::Digit(10); Hand::Digit; ``` -Both variants are named `Digit`, but since they’re scoped to the `enum` name, +Both variants are named `Digit`, but since they’re scoped to the `enum` name +there's no ambiguity. Not supporting these operations may seem rather limiting, but it’s a limitation which we can overcome. There are two ways: by implementing equality ourselves, diff --git a/src/doc/trpl/error-handling.md b/src/doc/trpl/error-handling.md index 95b39a660636a..b3689968b7fd1 100644 --- a/src/doc/trpl/error-handling.md +++ b/src/doc/trpl/error-handling.md @@ -204,7 +204,7 @@ Because these kinds of situations are relatively rare, use panics sparingly. In certain circumstances, even though a function may fail, we may want to treat it as a panic instead. For example, `io::stdin().read_line(&mut buffer)` returns -an `Result`, when there is an error reading the line. This allows us to +a `Result`, when there is an error reading the line. This allows us to handle and possibly recover from error. If we don't want to handle this error, and would rather just abort the program, diff --git a/src/doc/trpl/iterators.md b/src/doc/trpl/iterators.md index abb14a6020524..e0cc45c254b99 100644 --- a/src/doc/trpl/iterators.md +++ b/src/doc/trpl/iterators.md @@ -212,9 +212,9 @@ see why consumers matter. As we've said before, an iterator is something that we can call the `.next()` method on repeatedly, and it gives us a sequence of things. Because you need to call the method, this means that iterators -are *lazy* and don't need to generate all of the values upfront. -This code, for example, does not actually generate the numbers -`1-100`, and just creates a value that represents the sequence: +can be *lazy* and not generate all of the values upfront. This code, +for example, does not actually generate the numbers `1-100`, instead +creating a value that merely represents the sequence: ```rust let nums = 1..100; diff --git a/src/doc/trpl/lifetimes.md b/src/doc/trpl/lifetimes.md index 86164a08a430f..40def201dcc94 100644 --- a/src/doc/trpl/lifetimes.md +++ b/src/doc/trpl/lifetimes.md @@ -41,7 +41,7 @@ With that in mind, let’s learn about lifetimes. # Lifetimes Lending out a reference to a resource that someone else owns can be -complicated, however. For example, imagine this set of operations: +complicated. For example, imagine this set of operations: - I acquire a handle to some kind of resource. - I lend you a reference to the resource. diff --git a/src/doc/trpl/ownership.md b/src/doc/trpl/ownership.md index 971bb7cd700db..2dabfa917fbd0 100644 --- a/src/doc/trpl/ownership.md +++ b/src/doc/trpl/ownership.md @@ -108,7 +108,7 @@ println!("v[0] is: {}", v[0]); Same error: “use of moved value.” When we transfer ownership to something else, we say that we’ve ‘moved’ the thing we refer to. You don’t need some sort of -special annotation here, it’s the default thing that Rust does. +special annotation here; it’s the default thing that Rust does. ## The details diff --git a/src/doc/trpl/primitive-types.md b/src/doc/trpl/primitive-types.md index bb2bf028700d2..fc307413c5eff 100644 --- a/src/doc/trpl/primitive-types.md +++ b/src/doc/trpl/primitive-types.md @@ -82,7 +82,7 @@ Let’s go over them by category: Integer types come in two varieties: signed and unsigned. To understand the difference, let’s consider a number with four bits of size. A signed, four-bit number would let you store numbers from `-8` to `+7`. Signed numbers use -“two’s compliment representation”. An unsigned four bit number, since it does +“two’s complement representation”. An unsigned four bit number, since it does not need to store negatives, can store values from `0` to `+15`. Unsigned types use a `u` for their category, and signed types use `i`. The `i`