X-Git-Url: https://piware.de/gitweb/?p=learn-rust.git;a=blobdiff_plain;f=concepts%2Fsrc%2Flib.rs;h=5f1feea9404c8116e1cbb1106b825e5a6d52c677;hp=b0839ad391739cb186adcf2bb81c97484c5a3dfe;hb=HEAD;hpb=1962a5412d16f34c738e9f81bb5271da043a7505

diff --git a/concepts/src/lib.rs b/concepts/src/lib.rs
index b0839ad..f2b1c10 100644
--- a/concepts/src/lib.rs
+++ b/concepts/src/lib.rs
@@ -1,11 +1,10 @@
+use std::collections::HashMap;
 use std::fs::File;
 use std::io::prelude::*;
-use std::collections::HashMap;
 
 pub fn read_file(path: &str) -> Result<String, std::io::Error> {
     let mut s = String::new();
-    File::open(path)?
-        .read_to_string(&mut s)?;
+    File::open(path)?.read_to_string(&mut s)?;
     Ok(s)
 }
 
@@ -71,7 +70,10 @@ where
     V: Copy,
 {
     pub fn new(calc: T) -> Cacher<T, A, V> {
-        Cacher { calc, values: HashMap::new() }
+        Cacher {
+            calc,
+            values: HashMap::new(),
+        }
     }
 
     pub fn value(&mut self, arg: A) -> V {
@@ -87,7 +89,7 @@ where
 }
 
 pub struct Counter5 {
-    count: u32
+    count: u32,
 }
 
 impl Counter5 {
@@ -157,7 +159,7 @@ trait State {
 struct Draft {}
 impl State for Draft {
     fn request_review(&self) -> Box<dyn State> {
-        Box::new(PendingReview {acks: 0})
+        Box::new(PendingReview { acks: 0 })
     }
 
     fn approve(&mut self) -> Box<dyn State> {
@@ -176,14 +178,16 @@ struct PendingReview {
 
 impl State for PendingReview {
     fn request_review(&self) -> Box<dyn State> {
-        Box::new(Self {acks: self.acks})
+        Box::new(Self { acks: self.acks })
     }
 
     fn approve(&mut self) -> Box<dyn State> {
         if self.acks >= 1 {
             Box::new(Published {})
         } else {
-            Box::new(Self {acks: self.acks + 1})
+            Box::new(Self {
+                acks: self.acks + 1,
+            })
         }
     }
 
@@ -210,3 +214,54 @@ impl State for Published {
         &post.content
     }
 }
+
+// state encoded as types; this is the "approved" state
+pub struct TPost {
+    content: String,
+}
+
+impl TPost {
+    pub fn new() -> TPostDraft {
+        TPostDraft {
+            content: String::new(),
+        }
+    }
+
+    pub fn content(&self) -> &str {
+        &self.content
+    }
+}
+
+pub struct TPostDraft {
+    content: String,
+}
+
+impl TPostDraft {
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+
+    pub fn request_review(self) -> TPostReview {
+        TPostReview {
+            content: self.content,
+        }
+    }
+}
+
+pub struct TPostReview {
+    content: String,
+}
+
+impl TPostReview {
+    pub fn approve(self) -> TPost {
+        TPost {
+            content: self.content,
+        }
+    }
+
+    pub fn reject(self) -> TPostDraft {
+        TPostDraft {
+            content: self.content,
+        }
+    }
+}