Skip to content

Commit 1686f99

Browse files
committed
Merge remote-tracking branch 'origin/pr/2418'
2 parents 943c6b8 + 2dd624a commit 1686f99

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/ch04-01-what-is-ownership.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -388,10 +388,13 @@ we add the `Copy` annotation to that type, we’ll get a compile-time error. To
388388
learn about how to add the `Copy` annotation to your type, see [“Derivable
389389
Traits”][derivable-traits]<!-- ignore --> in Appendix C.
390390

391-
So what types are `Copy`? You can check the documentation for the given type to
392-
be sure, but as a general rule, any group of simple scalar values can be
393-
`Copy`, and nothing that requires allocation or is some form of resource is
394-
`Copy`. Here are some of the types that are `Copy`:
391+
So what types are `Copy`able? You can check the documentation for the given type to
392+
be sure, but as a general rule:
393+
394+
1. Any group of simple scalar values can have the `Copy` trait,
395+
2. Nothing that requires allocation or is some form of resource is `Copy`able.
396+
397+
Here are some of the types that are `Copy`able:
395398

396399
* All the integer types, such as `u32`.
397400
* The Boolean type, `bool`, with values `true` and `false`.

src/ch08-02-strings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ If the `push_str` method took ownership of `s2`, we wouldn’t be able to print
130130
its value on the last line. However, this code works as we’d expect!
131131

132132
The `push` method takes a single character as a parameter and adds it to the
133-
`String`. Listing 8-17 shows code that adds the letter *l* to a `String` using
133+
`String`. Listing 8-17 shows code that adds the letter "l" to a `String` using
134134
the `push` method.
135135

136136
```rust

0 commit comments

Comments
 (0)