From 72ec43263b5b6f3c8b24a722b1bf44b19fbd0b7d Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Thu, 14 Jul 2016 14:39:32 -0400 Subject: [PATCH] Fix references that are now invalid with the rearranging --- src/ch04-01-understanding-ownership.md | 7 +++---- src/ch04-02-ownership.md | 5 ----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/ch04-01-understanding-ownership.md b/src/ch04-01-understanding-ownership.md index 2b2eb43..ba39afe 100644 --- a/src/ch04-01-understanding-ownership.md +++ b/src/ch04-01-understanding-ownership.md @@ -1,6 +1,5 @@ # Understanding Ownership -Now that we’ve got some basic syntax under our belt, it’s time to take a look -at Rust’s most unique feature: ownership. We’ll also talk about several related -features: borrowing, slices, and lifetimes, as well as how Rust lays things out -in memory. +Now let's look at Rust’s most unique feature: ownership. We’ll also talk about +several related features: borrowing, slices, and lifetimes, as well as how Rust +lays things out in memory. diff --git a/src/ch04-02-ownership.md b/src/ch04-02-ownership.md index 9547ace..aaaea2a 100644 --- a/src/ch04-02-ownership.md +++ b/src/ch04-02-ownership.md @@ -168,11 +168,6 @@ the `String` is currently using. The capacity is the total amount of memory the and capacity matters, but not in this context, so don’t worry about it too much if it doesn’t make sense, and just ignore the capacity. -> We’ve talked about two kinds of composite types: arrays and tuples. `String` -> is a third type: a `struct`, which we will cover the details of in the next -> chapter of the book. For now, thinking about `String` as a tuple is close -> enough. - When we assign `s1` to `s2`, the `String` itself is copied. But not all kinds of copying are the same. Many people draw distinctions between ‘shallow copying’ and ‘deep copying’. We don’t use these terms in Rust. We instead say