debug crate is gone; scope_map no longer has .get() method

capnproto · Oct 26, 2014 · 1656b93 · 1656b93
1 parent 844ed40
commit 1656b93
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/src/capnp/lib.rs b/src/capnp/lib.rs
@@ -17,9 +17,6 @@
 #[phase(plugin, link)] extern crate log;
 extern crate libc;
 
-#[cfg(test)]
-extern crate debug;
-
 // reexports
 pub use blob::{text, data};
 pub use common::{MessageSize};

diff --git a/src/capnp/serialize_packed_test.rs b/src/capnp/serialize_packed_test.rs
@@ -25,7 +25,7 @@ pub fn expect_packs_to(unpacked : &[u8],
     }
 
     assert!(bytes.as_slice().eq(&packed),
-            "expected: {:?}, got: {:?}", packed, bytes);
+            "expected: {}, got: {}", packed, bytes);
 
     // --------
     // read
@@ -37,7 +37,7 @@ pub fn expect_packs_to(unpacked : &[u8],
 
 //    assert!(packed_input_stream.eof());
     assert!(bytes.slice(0, bytes.len()).eq(&unpacked),
-            "expected: {:?}, got: {:?}", unpacked, bytes);
+            "expected: {}, got: {}", unpacked, bytes);
 
 }
 

diff --git a/src/capnpc-rust/codegen.rs b/src/capnpc-rust/codegen.rs
@@ -275,7 +275,7 @@ fn list_list_type_param(scope_map : &collections::hashmap::HashMap<u64, Vec<Stri
                 }
                 type_::Struct(st) => {
                     format!("struct_list::{}<{lifetime}, {}::{}<{lifetime}>>", module,
-                            scope_map.get(&st.get_type_id()).connect("::"), module, lifetime = lifetime_name)
+                            scope_map[st.get_type_id()].connect("::"), module, lifetime = lifetime_name)
                 }
                 type_::List(t) => {
                     let inner = list_list_type_param(scope_map, t.get_element_type(), is_reader, lifetime_name);
@@ -321,7 +321,6 @@ fn getter_text (_node_map : &collections::hashmap::HashMap<u64, schema_capnp::no
                field : &schema_capnp::field::Reader,
                is_reader : bool)
     -> (String, FormattedText) {
-
     use schema_capnp::*;
 
     match field.which() {
@@ -478,8 +477,6 @@ fn getter_text (_node_map : &collections::hashmap::HashMap<u64, schema_capnp::no
         };
         return (typ.to_string(), interior);
     }
-
-
 }
 
 fn zero_fields_of_group(node_map : &collections::hashmap::HashMap<u64, schema_capnp::node::Reader>,