finished out rest of rc

Author: BartMassey

rc/Cargo.toml

@@ -3,3 +3,6 @@ name = "rc"
 version = "0.1.0"
 authors = ["Bart Massey <[email protected]>"]
 edition = "2018"
+
+[features]
+show_message_drop = []

rc/examples/04-messages.rs

@@ -1,16 +1,7 @@
 use rc::message::Message;
+use rc::misc::make_messages;
 use rc::counter::Counter;
 
-/// Make a couple of messages with given message strings.
-pub fn make_messages(m1: &'static str, m2: &'static str)
-                 -> (Message, Message)
-{
-    let counter = Counter::default();
-    let m1 = Message::with_counter(m1, Counter::clone(&counter));
-    let m2 = Message::with_counter(m2, counter);
-    (m1, m2)
-}
-
 fn main() {
     let (m1, m2) = make_messages("m1", "m2");
     println!("{} {:?}", m1.text(), m1);

rc/examples/05-cycles.rs

@@ -1,22 +1,17 @@
-// https://doc.rust-lang.org/std/cell/
-mod count;
-mod rcmessage;
-pub use rcmessage::*;
+use std::cell::RefCell;
+use std::rc::Rc;
 
-impl Drop for Message {
-    fn drop(&mut self) {
-        println!("dropping {}", self.message);
-    }
-}
+use rc::message::Message;
+use rc::misc::make_messages;
 
 #[derive(Clone)]
-struct MessageList<'a> {
+struct MessageList {
     cur: Message,
-    next: Option<Rc<RefCell<MessageList<'a>>>>,
+    next: Option<Rc<RefCell<MessageList>>>,
 }
 
-impl<'a> MessageList<'a> {
-    fn new(cur: Message) -> MessageList<'a> {
+impl MessageList {
+    fn new(cur: Message) -> MessageList {
         MessageList { cur, next: None }
     }
 
@@ -59,8 +54,8 @@ fn message() {
 
 /// Make a couple of message lists with given message
 /// strings and no tail.
-fn make_message_lists<'a>(m1: &'static str, m2: &'static str)
-                 -> (MessageList<'a>, MessageList<'a>)
+fn make_message_lists(m1: &'static str, m2: &'static str)
+                 -> (MessageList, MessageList)
 {
     let (m1, m2) = make_messages(m1, m2);
     let ml1 = MessageList::new(m1);

rc/src/lib.rs

@@ -4,3 +4,4 @@ pub mod count;
 pub mod counter;
 pub mod message;
 pub mod ctr;
+pub mod misc;

rc/src/message.rs

@@ -47,3 +47,25 @@ impl Message {
         self.counter.value()
     }
 }
+
+/// Some additional functionality for the `05-cycles` demo.
+impl Message {
+    /// Print the message and counter.
+    pub fn print(&self) {
+        self.counter.incr();
+        print!("{} {}", self.message, self.counter.value());
+    }
+
+    /// Add a newline.
+    pub fn println(&self) {
+        self.print();
+        println!();
+    }
+}
+
+#[cfg(feature = "show_message_drop")]
+impl Drop for Message {
+    fn drop(&mut self) {
+        println!("dropping message {}", self.message);
+    }
+}

rc/src/misc.rs

@@ -0,0 +1,12 @@
+use crate::counter::Counter;
+use crate::message::Message;
+
+/// Make a couple of messages with given message strings.
+pub fn make_messages(m1: &'static str, m2: &'static str)
+                 -> (Message, Message)
+{
+    let counter = Counter::default();
+    let m1 = Message::with_counter(m1, Counter::clone(&counter));
+    let m2 = Message::with_counter(m2, counter);
+    (m1, m2)
+}