Skip to content

Commit 5892f96

Browse files
committed
---
yaml --- r: 205745 b: refs/heads/beta c: 14d9d1c h: refs/heads/master i: 205743: 369318f v: v3
1 parent d230cb5 commit 5892f96

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3030
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3131
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
32-
refs/heads/beta: 5c7a0ba06e21e9b8b22b8bdc27c16e10c6c1a2ce
32+
refs/heads/beta: 14d9d1c1cfaec1843a2d16e1795a9300ddd73588
3333
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3434
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3535
refs/heads/tmp: 579e31929feff51dcaf8d444648eff8de735f91a

branches/beta/src/doc/complement-design-faq.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,13 @@ particularly easy to read.
165165

166166
## Why is `let` used to introduce variables?
167167

168-
We don't use the term "variable", instead, we use "variable bindings". The
169-
simplest way for binding is the `let` syntax, other ways including `if let`,
170-
`while let` and `match`. Bindings also exist in function arguments positions.
168+
Instead of the term "variable", we use "variable bindings". The
169+
simplest way for creating a binding is by using the `let` syntax.
170+
Other ways include `if let`, `while let`, and `match`. Bindings also
171+
exist in function argument positions.
171172

172173
Bindings always happen in pattern matching positions, and it's also Rust's way
173-
to declare mutability. One can also redeclare mutability of a binding in
174+
to declare mutability. One can also re-declare mutability of a binding in
174175
pattern matching. This is useful to avoid unnecessary `mut` annotations. An
175176
interesting historical note is that Rust comes, syntactically, most closely
176177
from ML, which also uses `let` to introduce bindings.

branches/beta/src/doc/trpl/hello-world.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ $ ./main # or main.exe on Windows
147147

148148
This prints out our `Hello, world!` text to our terminal.
149149

150-
If you come from a dynamically typed language like Ruby, Python, or JavaScript,
150+
If you come from a dynamic language like Ruby, Python, or JavaScript,
151151
you may not be used to these two steps being separate. Rust is an
152152
‘ahead-of-time compiled language’, which means that you can compile a program,
153153
give it to someone else, and they don't need to have Rust installed. If you

branches/beta/src/libcore/iter.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,8 +2246,9 @@ impl<I> RandomAccessIterator for Fuse<I> where I: RandomAccessIterator {
22462246
impl<I> ExactSizeIterator for Fuse<I> where I: ExactSizeIterator {}
22472247

22482248
impl<I> Fuse<I> {
2249-
/// Resets the fuse such that the next call to .next() or .next_back() will
2250-
/// call the underlying iterator again even if it previously returned None.
2249+
/// Resets the `Fuse` such that the next call to `.next()` or
2250+
/// `.next_back()` will call the underlying iterator again even if it
2251+
/// previously returned `None`.
22512252
#[inline]
22522253
#[unstable(feature = "core", reason = "seems marginal")]
22532254
pub fn reset_fuse(&mut self) {

0 commit comments

Comments
 (0)