Merge pull request #142 from bgamari/master

Nightly fallout

Author: bgamari

ioreg/parser.rs

@@ -471,7 +471,7 @@ impl<'a, 'b> Parser<'a, 'b> {
           self.bump();
           // for some reason ident begins with '/// '
           let s = token::get_ident(docstring.ident());
-          let stripped = s.get().trim_left_chars(&['/',' ']);
+          let stripped = s.get().trim_left_chars(['/',' '].as_slice());
           docs.push(String::from_str(stripped));
         },
         _ => break,

platformtree/builder/os.rs

@@ -102,7 +102,7 @@ fn build_args(builder: &mut Builder, cx: &mut ExtCtxt,
   all_keys.sort();
 
   for k in all_keys.iter() {
-    let v = node_attr.get(k);
+    let v = &(*node_attr)[*k];
 
     let (ty, val) = match v.value {
       node::IntValue(i) =>

platformtree/node.rs

@@ -261,7 +261,8 @@ impl Node {
 
   /// Returns attribute by name or fail!()s.
   pub fn get_attr(&self, key: &str) -> Rc<Attribute> {
-    self.attributes.borrow().get(&key.to_string()).clone()
+    let ref attr = (*self.attributes.borrow())[key.to_string()];
+    attr.clone()
   }
 
   /// Returns a string attribute by name or None, if it's not present or not of

platformtree/parser.rs

@@ -78,7 +78,7 @@ impl<'a> Parser<'a> {
         failed = true;
         self.sess.span_diagnostic.span_err(node.path_span,
             format!("duplicate node definition `{}`", path).as_slice());
-        let old_node: &Rc<node::Node> = nodes.get(&path);
+        let old_node: &Rc<node::Node> = &nodes[path];
         self.sess.span_diagnostic.span_err(old_node.path_span,
             "previously defined here");
       } else {
@@ -120,7 +120,7 @@ impl<'a> Parser<'a> {
                 "duplicate `{}` definition", name).as_slice());
 
             self.sess.span_diagnostic.span_warn(
-                map.get(name).upgrade().unwrap().name_span,
+                (*map)[*name].upgrade().unwrap().name_span,
                 "previously defined here");
             return false;
           } else {
@@ -316,7 +316,7 @@ impl<'a> Parser<'a> {
           self.span = node.path_span;
           self.error(format!("duplicate node definition `{}`",
               path));
-          let old_node: Rc<node::Node> = subnodes.as_map().get(&path).upgrade().unwrap();
+          let old_node: Rc<node::Node> = subnodes.as_map()[path].upgrade().unwrap();
           self.span = old_node.path_span.clone();
           self.error("previously defined here".to_string());
           return None;

src/hal/lpc17xx/pin_pt.rs

@@ -88,7 +88,7 @@ fn build_pin(builder: &mut Builder, cx: &mut ExtCtxt, node: Rc<node::Node>) {
   let function_str = match node.get_string_attr("function") {
     None => "GPIO".to_string(),
     Some(fun) => {
-      let pins = port_def.get(port_path);
+      let pins = &port_def[*port_path];
       let maybe_pin_index = from_str(node.path.as_slice()).unwrap();
       match pins[maybe_pin_index] {
         None => {