---

yaml
---
r: 24099
b: refs/heads/master
c: 7937905
h: refs/heads/master
i:
  24097: eabb938
  24095: d27837f
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 36602a1f7192db32420170415c037d96a0bc60f2
+refs/heads/master: 7937905dbf2a4578cc778370d1e1b0fed385024c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/doc/tutorial.md

@@ -389,6 +389,12 @@ of:
 `[mut T]`                 Mutable vector with unknown size
 ------------------------- -----------------------------------------------
 
+In function types, the return type is specified with an arrow, as in
+the type `fn() -> bool` or the function declaration `fn foo() -> bool
+{ }`.  For functions that do not return a meaningful value, you can
+optionally write `-> ()`, but usually the return annotation is simply
+left off, as in `fn main() { ... }`.
+
 Types can be given names with `type` declarations:
 
 ~~~~
@@ -402,28 +408,6 @@ error. Read about [single-variant enums](#single_variant_enum)
 further on if you need to create a type name that's not just a
 synonym.
 
-## Using types
-
-The `-> bool` in the `is_four` example is the way a function's return
-type is written. For functions that do not return a meaningful value,
-you can optionally say `-> ()`, but usually the return annotation is simply
-left off, as in the `fn main() { ... }` examples we've seen earlier.
-
-Every argument to a function must have its type declared (for example,
-`x: int`). Inside the function, type inference will be able to
-automatically deduce the type of most locals (generic functions, which
-we'll come back to later, will occasionally need additional
-annotation). Locals can be written either with or without a type
-annotation:
-
-~~~~
-// The type of this vector will be inferred based on its use.
-let x = [];
-# vec::map(x, fn&(_y: &int) -> int { *_y });
-// Explicitly say this is a vector of zero integers.
-let y: [int * 0] = [];
-~~~~
-
 ## Numeric literals
 
 Integers can be written in decimal (`144`), hexadecimal (`0x90`), and