Auto merge of servo#151 - aidanhs:aphs-fix-event-log-example, r=SimonSapin

bors-servo · bors-servo · commit e4760cf17ad8 · 2016-05-02T09:22:32.000-07:00
Fix event log example  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/string-cache/151)
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,7 @@ script:
   - cargo test --features log-events
   - "if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --features unstable; fi"
   - "if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --features heap_size; fi"
-  - "cd examples/summarize-events/ && cargo build"
+  - "cd examples/event-log/ && cargo build && cd ../.."
+  - "cd examples/summarize-events/ && cargo build && cd ../.."
 notifications:
   webhooks: http://build.servo.org:54856/travis
diff --git a/examples/event-log/src/main.rs b/examples/event-log/src/main.rs
@@ -13,19 +13,21 @@ use string_cache::Atom;
 use string_cache::event;
 
 use std::io;
+use std::io::prelude::*;
 
 fn main() {
     println!("Reading stdin to end of file");
-    let stdin = io::stdin().read_to_string().unwrap();
+    let mut stdin = String::new();
+    io::stdin().read_to_string(&mut stdin).unwrap();
     let mut atoms = vec![];
-    for word in stdin.as_slice().split(|c: char| c.is_whitespace()) {
-        atoms.push(Atom::from_slice(word));
+    for word in stdin.split(|c: char| c.is_whitespace()) {
+        atoms.push(Atom::from(word));
     }
 
-    let log = event::LOG.lock();
+    let log = event::LOG.lock().unwrap();
 
-    println!("Created {:u} atoms, logged {:u} events:", atoms.len(), log.len());
+    println!("Created {} atoms, logged {} events:", atoms.len(), log.len());
     for e in log.iter() {
-        println!("{}", e);
+        println!("{:?}", e);
     }
 }
