about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-04-10 06:04:00 -0700
committerbors <bors@rust-lang.org>2013-04-10 06:04:00 -0700
commita425b75c6490df3567be3bf2c0437a395d295ed8 (patch)
tree8988e66a9dcdb5e61ef768ba9d2d9d21b0b55be5
parent72228012343db793ff453b7cf038d973ccac61a7 (diff)
parent08bc392d94726fb04154ce3993c3d519e480b24b (diff)
downloadrust-a425b75c6490df3567be3bf2c0437a395d295ed8.tar.gz
rust-a425b75c6490df3567be3bf2c0437a395d295ed8.zip
auto merge of #5773 : dunsmoreb/rust/incoming, r=bstrie
Updates the tutorial to include a simple definition for tuples in section 4.2. Fixes #5132.
-rw-r--r--doc/tutorial.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/tutorial.md b/doc/tutorial.md
index 9a4b8472408..18bc94bdba5 100644
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@@ -495,7 +495,11 @@ omitted.
 
 A powerful application of pattern matching is *destructuring*:
 matching in order to bind names to the contents of data
-types. Assuming that `(float, float)` is a tuple of two floats:
+types.
+
+> ***Note:*** The following code makes use of tuples (`(float, float)`) which
+> are explained in section 5.3. For now you can think of tuples as a list of
+> items.
 
 ~~~~
 fn angle(vector: (float, float)) -> float {