Merge branch 'master' of github.com:eliovir/rust-examples

Author: eliovir

Makefile

@@ -6,7 +6,7 @@ TESTPROG:=$(patsubst %.rs,test-%,$(TESTSRC))
 SRC=$(wildcard *.rs)
 SRC:=$(filter-out $(TESTSRC),$(SRC))
 PROG:=$(patsubst %.rs,%,$(SRC))
-RUSTFLAGS= -L .
+RUSTFLAGS=
 
 .SILENT:
 .PRECIOUS: $(LIBSTAMP)
@@ -37,7 +37,10 @@ test: $(TESTPROG)
 		./$$EXE;\
 	done
 
-% : %.rs $(LIBSTAMP)
+tutorial-tasks-02_2-backgrounding_computations: tutorial-tasks-02_2-backgrounding_computations.rs  $(LIBSTAMP)
+	$(RUSTC) $(RUSTFLAGS) $< -o $@ -L .
+	
+% : %.rs
 	$(RUSTC) $(RUSTFLAGS) $< -o $@
 
 lib-stamps/% : %.rs

README.md

@@ -16,14 +16,15 @@ Examples are tested with version 0.7.
     * 3 Syntax basics: `tutorial-03-syntax_basics.rs`
     * 4.3 Loops (`for`, `for i.times`, `while`, `loop`): `tutorial-04_3-loops.rs`
     * 5.2 Enums: `tutorial-05_2-enum.rs`
+    * 5.3 Tuples: `tutorial-05_3-tuples.rs`
 * [Rust Tasks and Communication]
     * 2 Basics: `tutorial-tasks-02-basics.rs`
     * 2.1 Communication: `tutorial-tasks-02_1-communication.rs`
     * 2.2 Backgrounding computations: Futures: `tutorial-tasks-02_2-backgrounding_computations.rs`
 * [Doc unit testing]
     * Unit testing in Rust: `unittests.rs`
 * API
-    * Program to an 'interface', not an 'implementation', by Josh Davis: `lang-interface.rs`
+    * Program to an 'interface', not an 'implementation', by [Josh Davis](http://joshldavis.com/2013/07/01/program-to-an-interface-fool/): `lang-interface.rs`
     * Pointer snippets from Dave Herman's talk: `lang-pointers.rs`
     * extra::getopts: `api-extra-getopts.rs`
     * std::hashmap::HashMap: `api-std-hashmap.rs`

api-std-hashmap.rs

@@ -12,6 +12,7 @@ fn main() {
 	println(fmt!("Is there a key foo?  => %?", h.contains_key(& &"foo"))); // => true
 	println(fmt!("Is there a key baz?  => %?", h.contains_key(& &"baz"))); // => false
 	println(fmt!("The value for foo is => %?", h.find(& &"foo"))); // => Some(&42)
+	let key = "baz";
 	h.insert(key, 1);
 	println(fmt!("Is there a key baz?  => %?", h.contains_key(& &"baz"))); // => false
 
@@ -25,7 +26,6 @@ fn main() {
 	println(fmt!("Is there a key foo?  => %?", h.contains_key(&~"foo"))); // => true
 	println(fmt!("Is there a key baz?  => %?", h.contains_key(&~"baz"))); // => false
 	println(fmt!("The value for foo is => %?", h.find(&~"foo"))); // => Some(&42)
-	let key = "baz";
 	h.insert(key.to_owned(), 1);
 	println(fmt!("Is there a key baz?  => %?", h.contains_key(&~"baz"))); // => true
 }

tutorial-05_3-tuples.rs

@@ -0,0 +1,21 @@
+/**
+ * 5.3 Tuples
+ * http://static.rust-lang.org/doc/0.7/tutorial.html#tuples
+ *
+ * @license MIT license <http://www.opensource.org/licenses/mit-license.php>
+ */
+fn main() {
+	// A Tuple is an immutable fixed-size collection of values. 
+
+	let tuple0 = ();
+	println(fmt!("%?", tuple0));
+
+	let mytup: (int, int, float) = (10, 20, 30.0);
+	match mytup {
+		(a, b, c) => info!(a + b + (c as int))
+	}
+
+	let tuple1 = (5i, 6i);
+	let (first, _) = tuple1;
+	println(first.to_str());
+}