Skip to content

Commit de600ef

Browse files
committed
---
yaml --- r: 41906 b: refs/heads/master c: bca39a7 h: refs/heads/master v: v3
1 parent 908a303 commit de600ef

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 92e52bc95e554fc61e4b058850d878eb01de4bbd
2+
refs/heads/master: bca39a7a030ac21e3b0cc6a8da96b00f3465ebb4
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
55
refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/doc/rust.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,6 +3018,11 @@ Local variables are immutable unless declared with `let mut`. The
30183018
declaration (so `let mut x, y` declares two mutable variables, `x` and
30193019
`y`).
30203020

3021+
Function parameters are immutable unless declared with `mut`. The
3022+
`mut` keyword applies only to the following parameter (so `|mut x, y|`
3023+
and `fn f(mut x: ~int, y: ~int)` declare one mutable variable `x` and
3024+
one immutable variable `y`).
3025+
30213026
Local variables are not initialized when allocated; the entire frame worth of
30223027
local variables are allocated at once, on frame-entry, in an uninitialized
30233028
state. Subsequent statements within a function may or may not initialize the

trunk/doc/tutorial.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,18 +1226,6 @@ match crayons[0] {
12261226
}
12271227
~~~~
12281228
1229-
A vector can be destructured using pattern matching:
1230-
1231-
~~~~
1232-
let numbers: [int * 3] = [1, 2, 3];
1233-
let score = match numbers {
1234-
[] => 0,
1235-
[a] => a * 10,
1236-
[a, b] => a * 6 + b * 4,
1237-
[a, b, c, ..rest] => a * 5 + b * 3 + c * 2 + rest.len() as int
1238-
};
1239-
~~~~
1240-
12411229
The elements of a vector _inherit the mutability of the vector_,
12421230
and as such, individual elements may not be reassigned when the
12431231
vector lives in an immutable slot.

0 commit comments

Comments
 (0)