Updating README.md with code examples for new generic support.

Author: DavidDeSimone

.gitignore

@@ -1,2 +1,3 @@
 *~
-**/target
+**/target
+*.diff

README.md

@@ -105,25 +105,18 @@ fn parameter_type_test() {
         .first_call()
         .set_result(Some(11))
         .nth_call(2) // equiv to 'second_call'
-        .set_result(None);
+        .set_result(None)
+	.nth_call(3)
+	.set_result(None)
+	.nth_call(4)
+	.set_result(Some(1));
 
     mock.set_bar(method);
-
-    let result = mock.bar();
-    assert!(result == Some(11));
+    
+    assert!(mock.bar() == Some(11));
     assert!(mock.bar() == None);
-}
-
-#[test]
-fn parameter_gen_test() {
-    let mut mock = MockHelloWorld::new();
-    let method = mock.method_baz()
-        .first_call()
-	.set_result(Foo::new());
-
-    mock.set_baz(method);
-    let result = mock.baz(32);
-    assert!(result.x == 0 && result.y == 0);
+    assert!(mock.bar() == None);
+    assert!(mock.bar() == Some(1));
 }
 
 // You can also pass in a lambda to return a value. This can be used to return a value
@@ -180,6 +173,49 @@ fn called_once_failure_too_little() {
     // Foo is never called, this will panic on completion.
 }
 
+```
+
+## GENERICS
+
+As of mock_derive 0.5.0, we have (basic) support for generics. Check out tests/src/generics.rs for more examples.
+``` rust
+#[mock]
+trait GenericTrait<T, U>
+      where T: Clone {
+      fn merge(&self, t: T, u: U) -> U;
+}
+
+#[test]
+fn generic_test_one() {
+    let mut mock = MockGenericTrait::<f32, i32>::new();
+    let method = mock.method_merge()
+        .called_once()
+        .set_result(30);
+
+    mock.set_merge(method);
+    assert!(mock.merge(15.0, 15) == 30);
+}
+
+#[mock]
+trait LifetimeTrait<'a, T>
+    where T: 'a {
+    fn return_value(&self, t: T) -> &'a T;
+}
+
+static TEST_FLOAT: f32 = 1.0;
+
+#[test]
+fn generics_and_lifetime() {
+    let mut mock = MockLifetimeTrait::<'static, f32>::new();
+    let method = mock.method_return_value()
+        .called_once()
+        .set_result(&TEST_FLOAT);
+
+    mock.set_return_value(method);
+    assert!(mock.return_value(TEST_FLOAT.clone()) == &TEST_FLOAT);
+}
+
+
 ```
 
 ## TESTING

tests/src/generics.rs

@@ -33,6 +33,12 @@ trait GenericTrait<T, U, Z>
     }
 }
 
+#[mock]
+trait GenericTraitForMerging<T, U>
+      where T: Clone {
+      fn merge(&self, t: T, u: U) -> U;
+}
+
 #[mock]
 trait LifetimeTrait<'a, T>
     where T: 'a {
@@ -51,6 +57,18 @@ fn generic_test_one() {
     mock.mix_and_match(arg1, &arg2, &mut arg3);
 }
 
+
+#[test]
+fn generic_test_two() {
+    let mut mock = MockGenericTraitForMerging::<f32, i32>::new();
+    let method = mock.method_merge()
+        .called_once()
+        .set_result(30);
+
+    mock.set_merge(method);
+    assert!(mock.merge(15.0, 15) == 30);
+}
+
 #[allow(dead_code)]
 static TEST_FLOAT: f32 = 1.0;
 
@@ -62,5 +80,5 @@ fn generics_and_lifetime() {
         .set_result(&TEST_FLOAT);
 
     mock.set_return_value(method);
-    mock.return_value(TEST_FLOAT.clone());
+    assert!(mock.return_value(TEST_FLOAT.clone()) == &TEST_FLOAT);
 }