X-Git-Url: https://piware.de/gitweb/?p=learn-rust.git;a=blobdiff_plain;f=serde%2Fsrc%2Fmain.rs;h=8579522182ceacb24bf35ed9b3471f66c9d11259;hp=1357100b79351126faa8f046e27aa378611ff246;hb=68bc0a2a4326ea89f01c90ab909095ded5e087a4;hpb=c90073a9f013cde0cbf84fa43f986f6c74d38168

diff --git a/serde/src/main.rs b/serde/src/main.rs
index 1357100..8579522 100644
--- a/serde/src/main.rs
+++ b/serde/src/main.rs
@@ -1,6 +1,9 @@
 use std::fs;
+use std::error::Error;
 use serde::{Serialize, Deserialize};
 
+const DB_PATH: &str = "/tmp/contacts.json";
+
 #[derive(Serialize, Deserialize, Debug)]
 enum Social {
     Twitter(String),
@@ -25,15 +28,23 @@ fn build_contacts() -> Contacts {
     ]
 }
 
-fn create_contacts() {
+fn create_contacts() -> Result<(), Box<dyn Error>> {
     let contacts = build_contacts();
-    // FIXME: Use ? and return Result
-    let serialized = serde_json::to_string(&contacts).unwrap();
+    let serialized = serde_json::to_string(&contacts)?;
     println!("serialized: {}", serialized);
-    let mut f = fs::File::create("/tmp/contacts.json").unwrap_or_else(|e| panic!("Could not create /tmp/contacts.json: {:?}", e));
-    serde_json::to_writer_pretty(&mut f, &contacts).unwrap_or_else(|e| panic!("Could not serialize contacts: {:?}", e));
+    let mut f = fs::File::create(DB_PATH)?;
+    serde_json::to_writer_pretty(&mut f, &contacts)?;
+    Ok(())
+}
+
+fn load_contacts() -> Result<Contacts, Box<dyn Error>> {
+    let f = fs::File::open(DB_PATH)?;
+    Ok(serde_json::from_reader(f)?)
 }
 
-fn main() {
-    create_contacts();
+fn main() -> Result<(), Box<dyn Error>> {
+    create_contacts()?;
+    let contacts = load_contacts()?;
+    println!("deserialized: {:?}", contacts);
+    Ok(())
 }