Skip to content

Commit 4b4cb86

Browse files
committed
Rollup merge of rust-lang#25195 - simonkern:master, r=steveklabnik
I deleted one unneccessary 'the' and added the href for [bindings]
2 parents 6550420 + 60c0e75 commit 4b4cb86

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/doc/trpl/lifetimes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ fn main() {
116116
}
117117
```
118118

119-
[struct]: structs.html
119+
[structs]: structs.html
120120

121121
As you can see, `struct`s can also have lifetimes. In a similar way to functions,
122122

src/doc/trpl/ownership.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This guide is one of three presenting Rust’s ownership system. This is one of
44
Rust’s most unique and compelling features, with which Rust developers should
55
become quite acquainted. Ownership is how Rust achieves its largest goal,
6-
memory safety. The there are a few distinct concepts, each with its own
6+
memory safety. There are a few distinct concepts, each with its own
77
chapter:
88

99
* ownership, which you’re reading now.
@@ -59,6 +59,7 @@ deterministically, at the end of the scope.
5959

6060
[vect]: ../std/vec/struct.Vec.html
6161
[heap]: the-stack-and-the-heap.html
62+
[bindings]: variable-bindings.html
6263

6364
# Move semantics
6465

@@ -122,7 +123,7 @@ let v2 = v;
122123

123124
The first line creates some data for the vector on the [stack][sh], `v`. The
124125
vector’s data, however, is stored on the [heap][sh], and so it contains a
125-
pointer to that data. When we move `v` to `v2`, it creates a copy of that data,
126+
pointer to that data. When we move `v` to `v2`, it creates a copy of that pointer,
126127
for `v2`. Which would mean two pointers to the contents of the vector on the
127128
heap. That would be a problem: it would violate Rust’s safety guarantees by
128129
introducing a data race. Therefore, Rust forbids using `v` after we’ve done the

src/doc/trpl/references-and-borrowing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
This guide is one of three presenting Rust’s ownership system. This is one of
44
Rust’s most unique and compelling features, with which Rust developers should
55
become quite acquainted. Ownership is how Rust achieves its largest goal,
6-
memory safety. The there are a few distinct concepts, each with its own
6+
memory safety. There are a few distinct concepts, each with its own
77
chapter:
88

99
* [ownership][ownership], ownership, the key concept

0 commit comments

Comments
 (0)