auto merge of #19114 : frewsxcv/rust/master, r=bstrie

Fixes #19010
2014-11-21 19:06:52 +00:00 · 2014-11-21 19:06:52 +00:00 · 97c043b2e9
commit 97c043b2e9
parent f530aa08df ef5acff0db
4 changed files with 130 additions and 129 deletions
--- a/src/test/run-pass/issue-2804.rs
+++ b/src/test/run-pass/issue-2804.rs
@ -59,7 +59,7 @@ fn add_interfaces(store: int, managed_ip: String, device: HashMap<String, json::
 -> Vec<(String, object)> {
    match device["interfaces".to_string()]
    {
-        json::List(ref interfaces) =>
+        json::Array(ref interfaces) =>
        {
          interfaces.iter().map(|interface| {
                add_interface(store, managed_ip.clone(), (*interface).clone())