Changes to version 1.3.0 (9a92aaf19 2015-09-15)

Author: eliovir

.gitignore

@@ -1,6 +1,12 @@
 *~
 /build/
+Cargo.lock
 /doc/
+/inifile/target/
+/inifile/src/data/save_test.ini
+/inifile/src/data/write_test.ini
 /lib/
 /lib-stamps/
 /nbproject/private/
+*.o
+/target/

.travis.yml

@@ -1,5 +1,5 @@
 language: rust
-rust: 0.12.0
+rust: 1.4.0
 env:
 global:
 - secure: YuWDOwPGprL6PiBZVeGaLOCHHgC18fQ6nq617tlt7XFCkG17r/xDWq3iiAyNxNUcwsD9CkWi5aXok8SlX3rQx84XC/sya2bi0+8Frt9EztcVxgMwWuX3Ll4mFHO7HnMhazoQYRPd0b0w4s7bFY2WidxCqjsMKRgAM26Gn+6oQto=

Cargo.toml

@@ -3,3 +3,26 @@
 name = "rust-examples"
 version = "0.0.1"
 authors = ["Eliovir <[email protected]>"]
+
+[dependencies.inifile]
+path = "inifile"
+
+[dependencies]
+getopts = "0.2.14"
+rand = "0.3"
+
+[[bin]]
+name = "api-getopts"
+path = "api-getopts.rs"
+
+[[bin]]
+name = "book-3_1-guessing_game"
+path = "book-3_1-guessing_game.rs"
+
+[[bin]]
+name = "tutorial-tasks-02_3-arc"
+path = "tutorial-tasks-02_3-arc.rs"
+
+[[bin]]
+name = "tutorial-04_2-pattern-matching"
+path = "tutorial-04_2-pattern-matching.rs"

Makefile

@@ -1,3 +1,4 @@
+CARGO=printf "\033[32;1mCargo:\033[33m %s\033[m\n" $@; cargo
 RUSTC=printf "\033[32;1mRustc:\033[33m %s\033[m\n" $@; rustc
 LIBSRC:=$(shell grep -l 'crate_type = "lib"' *rs)
 LIBSTAMP=$(patsubst %.rs,lib-stamps/%,$(LIBSRC))
@@ -20,7 +21,7 @@ help:
 
 clean:
 	# Remove executables, test files, libraries
-	rm -fr $(PROG) $(TESTPROG) *~ build/ doc/ lib/ lib-stamps/
+	rm -fr $(PROG) $(TESTPROG) *.o *~ build/ doc/ lib/ lib-stamps/ target/
 
 bench: $(TESTPROG)
 	# Run benchmarks
@@ -60,9 +61,32 @@ version:
 	# Display version of source code
 	git describe
 
+build/api-getopts: api-getopts.rs build
+	$(CARGO) build --bin api-getopts
+	cp target/debug/api-getopts $@
+
+build/book-3_1-guessing_game: book-3_1-guessing_game.rs build
+	$(CARGO) build --bin book-3_1-guessing_game
+	cp target/debug/book-3_1-guessing_game $@
+
+build/inifile: inifile.rs build
+	$(CARGO) build --bin inifile
+	cp target/debug/inifile $@
+
 build/tutorial-tasks-02_2-backgrounding_computations: tutorial-tasks-02_2-backgrounding_computations.rs $(LIBSTAMP) build
 	$(RUSTC) $(RUSTFLAGS) $< -o $@ -L lib/
 
+build/tutorial-tasks-02_3-arc: tutorial-tasks-02_3-arc.rs build
+	$(CARGO) build --bin tutorial-tasks-02_3-arc
+	cp target/debug/tutorial-tasks-02_3-arc $@
+
+build/tutorial-04_2-pattern-matching: tutorial-04_2-pattern-matching.rs build
+	$(CARGO) build --bin tutorial-04_2-pattern-matching
+	cp target/debug/tutorial-04_2-pattern-matching $@
+
+build:
+	mkdir -p build
+
 build/% : %.rs
 	mkdir -p build
 	$(RUSTC) $(RUSTFLAGS) $< -o $@
@@ -73,6 +97,11 @@ lib-stamps/% : %.rs
 	mkdir -p lib-stamps ;
 	$(RUSTC) --out-dir lib/ $<  > $@;
 
+lib-stamps/inifilex : inifile.rs
+	mkdir -p lib
+	mkdir -p lib-stamps ;
+	$(CARGO) build --lib inifile
+
 build/test-% : %.rs $(LIBSTAMP)
 	mkdir -p build
 	$(RUSTC) $(RUSTFLAGS) $< -o $@ --test -L lib/

README.md

@@ -24,10 +24,9 @@ Examples are tested with version 0.12.0.
     * [15](http://doc.rust-lang.org/tutorial.html#closures) Closures: `tutorial-15-closure.rs`
     * [16](http://doc.rust-lang.org/tutorial.html#methods) Methods, with *constructor*: `tutorial-16-methods.rs`
     * [17](http://doc.rust-lang.org/tutorial.html#generics) Generics: `tutorial-17-generics.rs`
-* [Rust Tasks and Communication]
-    * [2](http://doc.rust-lang.org/guide-tasks.html#basics) Basics: `tutorial-tasks-02-basics.rs`
+* [Book]
+    * [4.6](http://doc.rust-lang.org/book/concurrency.html#threads) Concurrency, threads: `book-4-6-threads.rs`
     * [2.1](http://doc.rust-lang.org/guide-tasks.html#communication) Communication: `tutorial-tasks-02_1-communication.rs`
-    * [2.2](http://doc.rust-lang.org/guide-tasks.html#backgrounding-computations:-futures) Backgrounding computations: Futures: `tutorial-tasks-02_2-backgrounding_computations.rs`
     * [2.3](http://doc.rust-lang.org/guide-tasks.html#sharing-immutable-data-without-copy:-arc) Sharing immutable data without copy: Arc: `tutorial-tasks-02_3-arc.rs`
 * [Doc unit testing]
     * Unit testing in Rust: `unittests.rs`
@@ -42,7 +41,7 @@ Examples are tested with version 0.12.0.
     * [collections:hashmap::HashMap](http://doc.rust-lang.org/collections/hashmap/struct.HashMap.html): `api-collections-hashmap.rs`
     * [getopts](http://doc.rust-lang.org/getopts/index.html): `api-getopts.rs`
     * [std::from_str::FromStr](http://doc.rust-lang.org/std/from_str/trait.FromStr.html): `api-std-from_str.rs`
-    * [std::io::File](http://doc.rust-lang.org/std/io/index.html): `api-std-io-file.rs`
+    * [std::fs::File](http://doc.rust-lang.org/std/fs/index.html): `api-std-fs-file.rs`
     * [std::vec](http://doc.rust-lang.org/std/vec/index.html): OwnedVector, 2D-arrays, ...: `api-std-vec.rs`
 * Some new files:
     * `Makefile` to compile, run tests and run benchmarks
@@ -61,7 +60,7 @@ Examples are tested with version 0.12.0.
 
 [Tutorial]: http://doc.rust-lang.org/tutorial.html
 [The Rust Reference Manual]: http://doc.rust-lang.org/rust.html
-[Rust Tasks and Communication]: http://doc.rust-lang.org/guide-tasks.html
+[Book]: http://doc.rust-lang.org/book/
 [Doc unit testing]: http://doc.rust-lang.org/guide-testing.html
 [Rust Cheatsheet]: http://doc.rust-lang.org/complement-cheatsheet.html#how-do-i-express-phantom-types?
 

api-collections-hashmap.rs

@@ -1,51 +1,51 @@
 /**
- * http://doc.rust-lang.org/std/collections/hashmap/struct.HashMap.html
- * https://github.com/rust-lang/rust/blob/master/src/test/run-pass/hashmap-memory.rs#L39
- * https://github.com/rust-lang/rust/blob/master/src/libstd/collections/hashmap.rs
+ * http://doc.rust-lang.org/stable/std/collections/struct.HashMap.html
+ * https://github.com/rust-lang/rust/blob/1.0.0/src/test/run-pass/hashmap-memory.rs
+ * https://github.com/rust-lang/rust/blob/1.0.0/src/libstd/collections/hash/map.rs
  *
  * @license MIT license <http://www.opensource.org/licenses/mit-license.php>
  */
-extern crate debug;
-use std::collections::hashmap::{HashMap, Occupied, Vacant};
+use std::collections::HashMap;
+use std::collections::hash_map::Entry::{Occupied, Vacant};
 
 fn main() {
 	println!("Using borrowed pointers as keys.");
-	let mut h: HashMap<&str, int>;
+	let mut h: HashMap<&str, isize>;
 	h = HashMap::new();
 	h.insert("foo", 42);
 	println!("Is there a key foo?  => {}", h.contains_key(&("foo"))); // => true
 	println!("Is there a key baz?  => {}", h.contains_key(&("baz"))); // => false
-	println!("The value for foo is => {:?}", h.find(&("foo"))); // => Some(&42)
+	println!("The value for foo is => {:?}", h.get(&("foo"))); // => Some(&42)
 	let key = "baz";
 	h.insert(key, 1);
 	println!("Is there a key baz?  => {}", h.contains_key(&("baz"))); // => false
 
 	// Doing a find, inserting with a `proc()`, using the key to construct the value
 	let mut map = HashMap::<String, String>::new();
 	match map.entry("foo".to_string()) {
-		Vacant(entry) => { entry.set("bar".to_string()); },
+		Vacant(entry) => { entry.insert("bar".to_string()); },
 		Occupied(mut entry) => { entry.get_mut().push_str("bar"); },
 	}
-	println!("The value for foo is => {:?}", map.find(&("foo".to_string()))); // => Some(&~"foobar")
+	println!("The value for foo is => {:?}", map.get(&("foo".to_string()))); // => Some(&~"foobar")
 	// running this for the first time, will add "foo" with the value 1
 	// running the same for the second time, will add +1 to "foo"
 	match h.entry("foo") {
-		Vacant(entry) => { entry.set(1); },
+		Vacant(entry) => { entry.insert(1); },
 		Occupied(mut entry) => { *entry.get_mut() += 1; },
 	}
-	println!("foo={}", h.get(&("foo")));
+	println!("foo={:?}", h.get(&("foo")));
 	assert_eq!(h["foo"], 43);
 
 	// You don't actually need the HashMap to own the keys (but
 	// unless all keys are static, this will be likely to lead
 	// to problems, so I don't suggest you do it in reality)
 
 	println!("Using owned pointers as keys.");
-	let mut h = HashMap::<String, int>::new();
+	let mut h = HashMap::<String, isize>::new();
 	h.insert("foo".to_string(), 42);
 	println!("Is there a key foo?  => {}", h.contains_key(&"foo".to_string())); // => true
 	println!("Is there a key baz?  => {}", h.contains_key(&"baz".to_string())); // => false
-	println!("The value for foo is => {:?}", h.find(&"foo".to_string())); // => Some(&42)
+	println!("The value for foo is => {:?}", h.get(&"foo".to_string())); // => Some(&42)
 	h.insert(key.to_string(), 1);
 	println!("Is there a key baz?  => {}", h.contains_key(&"baz".to_string())); // => true
 
@@ -54,13 +54,13 @@ fn main() {
 	for (k, _) in h.iter() {
 		keys.push(k.to_string());
 	}
-	println!("These are the keys: {}.", keys);
+	println!("These are the keys: {:?}.", keys);
 	let keys = h.keys().map(|v| v.clone()).collect::<Vec<String>>();
-	println!("These are the keys: {}.", keys);
+	println!("These are the keys: {:?}.", keys);
 
 	// List values of the HashMap
-	let values = h.values().map(|v| v.clone()).collect::<Vec<int>>();
-	println!("These are the values: {}.", values);
+	let values = h.values().map(|v| v.clone()).collect::<Vec<isize>>();
+	println!("These are the values: {:?}.", values);
 
 	// type inference lets us omit an explicit type signature (which
 	// would be `HashMap<&str, &str>` in this example).
@@ -84,7 +84,7 @@ fn main() {
 	// look up the values associated with some keys.
 	let to_find = ["Pride and Prejudice", "Alice's Adventure in Wonderland"];
 	for book in to_find.iter() {
-		match book_reviews.find(book) {
+		match book_reviews.get(book) {
 			Some(review) => println!("{}: {}", *book, *review),
 			None => println!("{} is unreviewed.", *book)
 		}

api-getopts.rs

@@ -1,11 +1,11 @@
 /**
- * http://doc.rust-lang.org/getopts/index.html
+ * http://doc.rust-lang.org/getopts/getopts/index.html
  *
  * @license MIT license <http://www.opensource.org/licenses/mit-license.php>
  */
 extern crate getopts;
-use getopts::{optopt,optflag,getopts,OptGroup};
-use std::os;
+use getopts::Options;
+use std::env;
 
 fn do_work(inp: &str, out: Option<String>) {
 	println!("{}", inp);
@@ -15,35 +15,35 @@ fn do_work(inp: &str, out: Option<String>) {
 	}
 }
 
-fn print_usage(program: &str, _opts: &[OptGroup]) {
-	println!("Usage: {} [options]", program);
-	println!("-o\t\tOutput");
-	println!("-h --help\tUsage");
+fn print_usage(program: &str, opts: Options) {
+	let brief = format!("Usage: {} FILE [options]", program);
+	print!("{}", opts.usage(&brief));
 }
 
+#[cfg(not(test))]
 fn main() {
-	let args: Vec<String> = os::args();
+	let args: Vec<String> = env::args().collect();
 
 	let program = args[0].clone();
 
-	let opts = [
-		optopt("o", "", "set output file name", "NAME"),
-		optflag("h", "help", "print this help menu")
-	];
-	let matches = match getopts(args.tail(), opts) {
+	let mut opts = Options::new();
+	opts.optopt("o", "", "set output file name", "NAME");
+	opts.optflag("h", "help", "print this help menu");
+
+	let matches = match opts.parse(&args[1..]) {
 		Ok(m) => { m }
-		Err(f) => { fail!(f.to_string()) }
+		Err(f) => { panic!(f.to_string()) }
 	};
 	if matches.opt_present("h") {
-		print_usage(program.as_slice(), opts);
+		print_usage(&program, opts);
 		return;
 	}
 	let output = matches.opt_str("o");
 	let input = if !matches.free.is_empty() {
 		matches.free[0].clone()
 	} else {
-		print_usage(program.as_slice(), opts);
+		print_usage(&program, opts);
 		return;
 	};
-	do_work(input.as_slice(), output);
+	do_work(&input, output);
 }

api-std-from_str.rs

@@ -1,32 +1,34 @@
 /**
  * Converting from String
  * http://doc.rust-lang.org/std/from_str/trait.FromStr.html
+ * http://doc.rust-lang.org/std/primitive.str.html#method.parse
  *
  * @license MIT license <http://www.opensource.org/licenses/mit-license.php>
  **/
+use std::num::ParseIntError;
 
 fn main() {
 	/*
 	 * When converting from string to numbers, you will have to provide the type manually
 	 */
-	let f: f32 = from_str("1.2").unwrap();
+	let f: f32 = "1.2".parse().ok().expect("Wrong format!");
 	assert_eq!(f, 1.2f32);
 	// or
-	let i = from_str::<uint>("5").unwrap();
+	let i : i32 = "5".parse().unwrap();
 	assert_eq!(i, 5);
 
-	let oi: Option<uint> = from_str("1");
-	assert_eq!(oi, Some(1u));
-	// None, if the provided string cannot be converted
-	let oi: Option<uint> = from_str("x");
-	assert_eq!(oi, None);
+	let oi: Result<u32, ParseIntError> = "1".parse();
+	assert_eq!(oi, Ok(1));
+	// Error, if the provided string cannot be converted
+	let oi: Result<u32, ParseIntError> = "x".parse();
+	assert!(oi.is_err());
 
-	let i: uint = match from_str("1") {
-		Some(value) => value,
-		None        => fail!("oops, expected a number")
+	let i: u32 = match "1".parse() {
+		Ok(value) => value,
+		Err(_)    => panic!("oops, expected a number")
 	};
-	assert_eq!(i, 1u);
+	assert_eq!(i, 1);
 
-	let i: uint = from_str("4").unwrap_or(0u);
-	assert_eq!(i, 4u);
+	let i: u32 = "4".parse().unwrap_or(0);
+	assert_eq!(i, 4);
 }

api-std-fs-file.rs

@@ -0,0 +1,40 @@
+/**
+ * http://doc.rust-lang.org/std/fs/struct.File.html
+ *
+ * @license MIT license <http://www.opensource.org/licenses/mit-license.php>
+ */
+use std::io::BufReader;
+use std::io::prelude::*;
+use std::fs::File;
+use std::path::Path;
+
+fn main() {
+
+	let mut f = File::open("foo.txt").ok().expect("foo.txt not open");
+	let mut buffer = Vec::new();
+	let result = f.read_to_end(&mut buffer);
+	println!("size: {}", result.ok().expect("foo.txt not read"));
+
+	/*
+	 * Read a complete file
+	 */
+	let path = Path::new("inifile/src/data/config.ini");
+	let mut hw_file = File::open(&path).ok().expect("file not open");
+	let mut data = Vec::new();
+	match hw_file.read_to_end(&mut data) {
+		Ok(s) => println!("size: {}, data: {:?}", s, data),
+		Err(e) => panic!("error while reading {} : {}", path.to_str().unwrap(), e)
+	}
+
+	/*
+	 * Iterate over the lines of a file
+	 */
+	let hw_file = File::open(&path).ok().expect("file not open");
+	let file = BufReader::new(hw_file);
+	for line in file.lines() {
+		match line {
+			Ok(nread) => println!("{}", nread),
+			Err(e) => println!("error reading: {}", e)
+		}
+	}
+}