Code cleanup & fixes for nightly rustc updates

platformtree/pt.rs

@@ -47,7 +47,7 @@ pub struct Node {
 impl Node {
   pub fn new() -> Node {
     Node {
-      name: Some(String::from_str("test")),
+      name: None,
       path: Path {
         absolute: false,
         path: Vec::new(),

src/drivers/chario.rs

@@ -18,7 +18,7 @@
 use core::option::{Some, None};
 use core::str::{Str, StrSlice};
 use core::slice::{Vector, ImmutableVector};
-use core::container::Container;
+use core::collections::Collection;
 use core::iter::Iterator;
 
 use core::mem::zeroed;