---

yaml
---
r: 32760
b: refs/heads/dist-snap
c: 36602a1
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 0cabd6fa1a87f5a6c522cddcbaeb2a189000dfe7
+refs/heads/dist-snap: 36602a1f7192db32420170415c037d96a0bc60f2
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/doc/rust.css

@@ -81,4 +81,16 @@ blockquote {
     border-left: solid 1px silver;
     margin: 1em;
     padding: 0.5em 1em 0.5em 1em;
-}
+}
+
+/* Make the table under the tutorial's 'Types' section look nicer */
+table {
+    border-top: 1px solid silver;
+    border-bottom: 1px solid silver;
+    padding: 0.8em;
+    font-size: smaller;
+}
+/* Also for the benefit of the type table
+td {
+    padding-right: 1em;
+}

branches/dist-snap/doc/tutorial.md

@@ -354,67 +354,40 @@ grow on you (hopefully).
 
 ## Types
 
-The basic types are written like this:
-
-`()`
-  : Nil, the type that has only a single value.
-
-`bool`
-  : Boolean type, with values `true` and `false`.
-
-`int`
-  : A machine-pointer-sized integer.
-
-`uint`
-  : A machine-pointer-sized unsigned integer.
-
-`i8`, `i16`, `i32`, `i64`
-  : Signed integers with a specific size (in bits).
-
-`u8`, `u16`, `u32`, `u64`
-  : Unsigned integers with a specific size.
-
-`float`
-  : The largest floating-point type efficiently supported on the target
-    machine.
-
-`f32`, `f64`
-  : Floating-point types with a specific size.
-
-`char`
-  : A Unicode character (32 bits).
+The basic types include the usual boolean, integral, and floating point types.
+
+------------------------- -----------------------------------------------
+`()`                      Nil, the type that has only a single value
+`bool`                    Boolean type, with values `true` and `false`
+`int`, `uint`             Machine-pointer-sized signed and unsigned integers
+`i8`, `i16`, `i32`, `i64` Signed integers with a specific size (in bits)
+`u8`, `u16`, `u32`, `u64` Unsigned integers with a specific size
+`float`                   The largest floating-point type efficiently supported on the target machine
+`f32`, `f64`              Floating-point types with a specific size.
+`char`                    A Unicode character (32 bits).
+------------------------- -----------------------------------------------
 
 These can be combined in composite types, which will be described in
 more detail later on (the `T`s here stand for any other type):
 
-`[T * N]`
-  : Vector (like an array in other languages) with N elements.
-
-`[mut T * N]`
-  : Mutable vector with N elements.
-
-`(T1, T2)`
-  : Tuple type. Any arity above 1 is supported.
-
-`@T`, `~T`, `&T`
-  : Pointer types. See [Boxes and pointers](#boxes-and-pointers) for an explanation of what `@`, `~`, and `&` mean.
+------------------------- -----------------------------------------------
+`[T * N]`                 Vector (like an array in other languages) with N elements
+`[mut T * N]`             Mutable vector with N elements
+`(T1, T2)`                Tuple type. Any arity above 1 is supported
+`@T`, `~T`, `&T`          [Pointer types](#boxes-and-pointers)
+------------------------- -----------------------------------------------
 
 Some types can only be manipulated by pointer, never directly. For instance,
 you cannot refer to a string (`str`); instead you refer to a pointer to a
 string (`@str`, `~str`, or `&str`). These *dynamically-sized* types consist
 of:
 
-`fn(arg1: T1, arg2: T2) -> T3`
-  : Function types.
-
-`str`
-  : String type (in UTF-8).
-
-`[T]`
-  : Vector with unknown size (also called a slice).
-
-`[mut T]`
-  : Mutable vector with unknown size.
+------------------------- -----------------------------------------------
+`fn(a: T1, b: T2) -> T3`  Function types
+`str`                     String type (in UTF-8)
+`[T]`                     Vector with unknown size (also called a slice)
+`[mut T]`                 Mutable vector with unknown size
+------------------------- -----------------------------------------------
 
 Types can be given names with `type` declarations: