From 0f0f5910f44a9520a1c11759f66a9d112d84c077 Mon Sep 17 00:00:00 2001
From: Tyler Neely <t@jujit.su>
Date: Sat, 13 Dec 2014 16:06:43 -0500
Subject: [PATCH] update readme

---
 README.md | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 7dc506e..539753f 100644
--- a/README.md
+++ b/README.md
@@ -14,27 +14,21 @@ extern crate rocksdb;
 use rocksdb::RocksDB;
 
 fn main() {
-  match RocksDB::open_default("/path/for/rocksdb/storage") {
-    Ok(db) => {
-      db.put(b"my key", b"my value");
-
-      db.get(b"my key").map( |value| {
+    let db = RocksDB::open_default("/path/for/rocksdb/storage").unwrap;
+    db.put(b"my key", b"my value");
+    db.get(b"my key").map( |value| {
         match value.to_utf8() {
-          Some(v) =>
-            println!("retrieved utf8 value {}", v),
-          None =>
-            println!("did not read valid utf-8 out of the db"),
+            Some(v) =>
+                println!("retrieved utf8 value {}", v),
+            None =>
+                println!("did not read valid utf-8 out of the db"),
         }
-      })
+    })
         .on_absent( || { println!("value not found") })
         .on_error( |e| { println!("error retrieving value: {}", e) });
 
-      db.delete(b"my key");
-
-      db.close();
-    },
-    Err(e) => panic!(e),
-  }
+    db.delete(b"my key");
+    db.close();
 }
 ```
 
@@ -43,7 +37,7 @@ fn main() {
   - [x] linux support
   - [x] rocksdb compiled via cargo
   - [x] OSX support
-  - [ ] rustic merge operator
+  - [x] rustic merge operator
   - [ ] batch
   - [ ] iterator
   - [ ] range