Fixes

gistfile1.txt

diff --git a/src/lib/codegen.rs b/src/lib/codegen.rs
index 3166f63..f8121a8 100644
--- a/src/lib/codegen.rs
+++ b/src/lib/codegen.rs
@@ -800,7 +800,7 @@ impl<'a> IndentWriter<'a> {

     #[allow(dead_code)]
     fn fail<S : Str>(&self, reason: S) {
-        self.write_line(format!("fail!({:?});", reason));
+        self.write_line(format!("fail!({});", reason.as_slice()));
     }

     #[allow(dead_code)]
@@ -877,7 +877,7 @@ impl<'a> IndentWriter<'a> {
     }

     fn assert_wire_type(&self, wire_type: wire_format::WireType) {
-        self.if_stmt(format!("wire_type != ::protobuf::wire_format::{:?}", wire_type), |w| {
+        self.if_stmt(format!("wire_type != ::protobuf::wire_format::{}", wire_type), |w| {
             // TODO: write wire type
             let message = "\"unexpected wire type\".to_string()";
             w.write_line(format!("return ::std::result::Err(::protobuf::ProtobufWireError({}));", message));
@@ -939,7 +939,7 @@ fn write_merge_from_field(w: &mut IndentWriter) {
                 }
             },
             RepeatPacked => {
-                w.write_line(format!("if wire_type == ::protobuf::wire_format::{:?} {{", wire_format::WireTypeLengthDelimited));
+                w.write_line(format!("if wire_type == ::protobuf::wire_format::{} {{", wire_format::WireTypeLengthDelimited));
                 w.indented(|w| {
                     w.write_line("let len = try!(is.read_raw_varint32());");
                     w.write_line("let old_limit = is.push_limit(len);");
@@ -1029,7 +1029,7 @@ fn write_message_compute_sizes(w: &mut IndentWriter) {
                                     },
                                     _ => {
                                         w.write_line(format!(
-                                                "my_size += ::protobuf::rt::value_size({:d}, *value, ::protobuf::wire_format::{:?});",
+                                                "my_size += ::protobuf::rt::value_size({:d}, *value, ::protobuf::wire_format::{});",
                                                 field.number as int, field.wire_type));
                                     },
                                 }
@@ -1070,7 +1070,7 @@ fn write_message_write_field(w: &mut IndentWriter) {
     };
     let write_value_lines = match field.field_type {
         FieldDescriptorProto_TYPE_MESSAGE => vec!(
-            format!("try!(os.write_tag({:d}, ::protobuf::wire_format::{:?}));",
+            format!("try!(os.write_tag({:d}, ::protobuf::wire_format::{}));",
                     field_number as int, wire_format::WireTypeLengthDelimited),
             format!("try!(os.write_raw_varint32(sizes[*sizes_pos]));"),
doug-2:rust-protobuf doug$ git diff > junk
doug-2:rust-protobuf doug$ cat junk
diff --git a/src/lib/codegen.rs b/src/lib/codegen.rs
index 3166f63..f8121a8 100644
--- a/src/lib/codegen.rs
+++ b/src/lib/codegen.rs
@@ -800,7 +800,7 @@ impl<'a> IndentWriter<'a> {

     #[allow(dead_code)]
     fn fail<S : Str>(&self, reason: S) {
-        self.write_line(format!("fail!({:?});", reason));
+        self.write_line(format!("fail!({});", reason.as_slice()));
     }

     #[allow(dead_code)]
@@ -877,7 +877,7 @@ impl<'a> IndentWriter<'a> {
     }

     fn assert_wire_type(&self, wire_type: wire_format::WireType) {
-        self.if_stmt(format!("wire_type != ::protobuf::wire_format::{:?}", wire_type), |w| {
+        self.if_stmt(format!("wire_type != ::protobuf::wire_format::{}", wire_type), |w| {
             // TODO: write wire type
             let message = "\"unexpected wire type\".to_string()";
             w.write_line(format!("return ::std::result::Err(::protobuf::ProtobufWireError({}));", message));
@@ -939,7 +939,7 @@ fn write_merge_from_field(w: &mut IndentWriter) {
                 }
             },
             RepeatPacked => {
-                w.write_line(format!("if wire_type == ::protobuf::wire_format::{:?} {{", wire_format::WireTypeLengthDelimited));
+                w.write_line(format!("if wire_type == ::protobuf::wire_format::{} {{", wire_format::WireTypeLengthDelimited));
                 w.indented(|w| {
                     w.write_line("let len = try!(is.read_raw_varint32());");
                     w.write_line("let old_limit = is.push_limit(len);");
@@ -1029,7 +1029,7 @@ fn write_message_compute_sizes(w: &mut IndentWriter) {
                                     },
                                     _ => {
                                         w.write_line(format!(
-                                                "my_size += ::protobuf::rt::value_size({:d}, *value, ::protobuf::wire_format::{:?});",
+                                                "my_size += ::protobuf::rt::value_size({:d}, *value, ::protobuf::wire_format::{});",
                                                 field.number as int, field.wire_type));
                                     },
                                 }
@@ -1070,7 +1070,7 @@ fn write_message_write_field(w: &mut IndentWriter) {
     };
     let write_value_lines = match field.field_type {
         FieldDescriptorProto_TYPE_MESSAGE => vec!(
-            format!("try!(os.write_tag({:d}, ::protobuf::wire_format::{:?}));",
+            format!("try!(os.write_tag({:d}, ::protobuf::wire_format::{}));",
                     field_number as int, wire_format::WireTypeLengthDelimited),
             format!("try!(os.write_raw_varint32(sizes[*sizes_pos]));"),
             format!("*sizes_pos += 1;"),
@@ -1091,7 +1091,7 @@ fn write_message_write_field(w: &mut IndentWriter) {
         },
         RepeatPacked => {
             w.if_self_field_is_not_empty(|w| {
-                w.write_line(format!("try!(os.write_tag({:d}, ::protobuf::wire_format::{:?}));", field_number as int, wire_format::WireTypeLengthDelimited));
+                w.write_line(format!("try!(os.write_tag({:d}, ::protobuf::wire_format::{}));", field_number as int, wire_format::WireTypeLengthDelimited));
                 // Data size is computed again here,
                 // probably it should be cached in `sizes` vec
                 let data_size_expr = w.self_field_vec_packed_data_size();
diff --git a/src/lib/protobuf.rs b/src/lib/protobuf.rs
index 0de075b..601664d 100644
--- a/src/lib/protobuf.rs
+++ b/src/lib/protobuf.rs
@@ -8,7 +8,6 @@

 extern crate sync;
 extern crate collections;
-extern crate debug;

 pub use unknown::UnknownFields;
 pub use unknown::UnknownValues;

gistfile2.txt

doug-2:rust-protobuf doug$ cargo test
   Compiling protobuf v0.0.1 (file:///Users/doug/dev/rust-protobuf)
src/lib/unknown.rs:128:14: 128:65 warning: use of deprecated item: use entry instead, #[warn(deprecated)] on by default
src/lib/unknown.rs:128             .find_or_insert_with(number, |_| Default::default())
                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/lib/protobuf.rs:1:1: 1:38 warning: unused attribute, #[warn(unused_attributes)] on by default
src/lib/protobuf.rs:1 #![crate_id(name = "protobuf#0.1.0")]
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/lib/unknown.rs:128:14: 128:65 warning: use of deprecated item: use entry instead, #[warn(deprecated)] on by default
src/lib/unknown.rs:128             .find_or_insert_with(number, |_| Default::default())
                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/lib/protobuf.rs:1:1: 1:38 warning: unused attribute, #[warn(unused_attributes)] on by default
src/lib/protobuf.rs:1 #![crate_id(name = "protobuf#0.1.0")]
                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Running target/protobuf-dd7dc4608ef47459

running 49 tests
test hex::test::test_decode_hex ... ok
test singular::test::test_set_default_clears ... ok
test misc::test::test_vec_writer ... ok
test hex::test::test_encode_hex ... ok
test stream::test::test_input_stream_limits ... ok
test stream::test::test_input_stream_read_double ... ok
test stream::test::test_input_stream_read_raw_byte ... ok
test stream::test::test_input_stream_read_varint ... ok
test stream::test::test_input_stream_skip_raw_bytes ... ok
test stream::test::test_output_input_stream_read_float ... ok
test stream::test::test_output_stream_write_double_no_tag ... ok
test stream::test::test_output_stream_write_float_no_tag ... ok
test stream::test::test_output_stream_write_raw_byte ... ok
test stream::test::test_output_stream_write_raw_bytes ... ok
test stream::test::test_output_stream_write_raw_little_endian32 ... ok
test stream::test::test_output_stream_write_raw_little_endian64 ... ok
test stream::test::test_output_stream_write_raw_varint32 ... ok
test stream::test::test_output_stream_write_raw_varint64 ... ok
test stream::test::test_output_stream_write_tag ... ok
test strx::test::test_remove_prefix ... ok
test strx::test::test_remove_prefix_fail ... ok
test strx::test::test_remove_suffix ... ok
test strx::test::test_remove_suffix_fail ... ok
test strx::test::test_remove_to ... ok
test test::test1 ... ok
test test::test2 ... ok
test test::test3 ... ok
test test::test_default_instance ... ok
test test::test4 ... ok
test test::test_empty ... ok
test test::test_read_junk ... ok
test test::test_read_missing_required ... ok
test test::test_file_descriptor_proto ... ok
test test::test_read_packed_expect_unpacked ... ok
test test::test_read_unpacked_expect_packed ... ok
test test::test_enum_descriptor ... ok
test test::test_message_descriptor ... ok
test test::test_types_repeated ... ok
test test::test_types_repeated_packed ... ok
test test::test_types_singular ... ok
test test::test_write_missing_required ... ok
test test::test_unknown_fields_fixed32 ... ok
test test::test_unknown_fields_length_delimited ... ok
test text_format::test::test_show ... ok
test text_format::test::test_repeated_multiple ... ok
test text_format::test::test_complex_message ... ok
test zigzag::test::test_zig_zag ... ok
test text_format::test::test_repeated_one ... ok
test text_format::test::test_singular ... ok

test result: ok. 49 passed; 0 failed; 0 ignored; 0 measured

   Doc-tests protobuf

running 0 tests

test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured