Skip to content

Commit 813db08

Browse files
committed
auto merge of #11684 : FlaPer87/rust/doc_typos, r=cmr
2 parents e65a8b8 + 1089bfe commit 813db08

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/librustc/middle/borrowck/doc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ checker uses a data flow propagation to compute the full set of loans
179179
in scope at each expression and then uses that set to decide whether
180180
that expression is legal. Remember that the scope of loan is defined
181181
by its lifetime LT. We sometimes say that a loan which is in-scope at
182-
a particular point is an "outstanding loan", aand the set of
182+
a particular point is an "outstanding loan", and the set of
183183
restrictions included in those loans as the "outstanding
184184
restrictions".
185185

src/librustc/middle/moves.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ case, the value is read, and the container (`x`) is also read.
3838
In the second case, `y`, `x.b` is being assigned which has type
3939
`~int`. Because this type moves by default, that will be a move
4040
reference. Whenever we move from a compound expression like `x.b` (or
41-
`x[b]` or `*x` or `{x)[b].c`, etc), this invalidates all containing
41+
`x[b]` or `*x` or `{x}[b].c`, etc), this invalidates all containing
4242
expressions since we do not currently permit "incomplete" variables
4343
where part of them has been moved and part has not. In this case,
4444
this means that the reference to `x` is also a move. We'll see later,
@@ -56,7 +56,7 @@ For each binding in a match or let pattern, we also compute a read
5656
or move designation. A move binding means that the value will be
5757
moved from the value being matched. As a result, the expression
5858
being matched (aka, the 'discriminant') is either moved or read
59-
depending on whethe the bindings move the value they bind to out of
59+
depending on whether the bindings move the value they bind to out of
6060
the discriminant.
6161
6262
For examples, consider this match expression:

0 commit comments

Comments
 (0)