update to rust breaking change

rust-lang/rust#19298
stepancheg · Nov 28, 2014 · 29d61df · 29d61df
1 parent ea6b2c4
commit 29d61df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/lib/codegen.rs b/src/lib/codegen.rs
@@ -717,7 +717,7 @@ impl EnumValue {
 
 struct IndentWriter<'a> {
     // TODO: add mut
-    writer: &'a Writer + 'a,
+    writer: &'a (Writer + 'a),
     indent: String,
     msg: Option<&'a MessageInfo<'a>>,
     field: Option<&'a Field>,

diff --git a/src/lib/reflect.rs b/src/lib/reflect.rs
@@ -143,11 +143,11 @@ trait FieldAccessorGeneric {
 }
 
 struct FieldAccessorGenericImpl<M> {
-    accessor: &'static FieldAccessor<M> + 'static
+    accessor: &'static (FieldAccessor<M> + 'static)
 }
 
 impl<M : Message> FieldAccessorGenericImpl<M> {
-    fn new(a: &'static FieldAccessor<M> + 'static) -> FieldAccessorGenericImpl<M> {
+    fn new(a: &'static (FieldAccessor<M> + 'static)) -> FieldAccessorGenericImpl<M> {
         FieldAccessorGenericImpl {
             accessor: a
         }
@@ -258,7 +258,7 @@ pub struct FieldDescriptor {
 }
 
 impl FieldDescriptor {
-    fn new<M : 'static + Message>(a: &'static FieldAccessor<M> + 'static, proto: &'static FieldDescriptorProto)
+    fn new<M : 'static + Message>(a: &'static (FieldAccessor<M> + 'static), proto: &'static FieldDescriptorProto)
         -> FieldDescriptor
     {
         assert_eq!(proto.get_name(), a.name());
@@ -425,7 +425,7 @@ impl MessageDescriptor {
 
     pub fn new<M : 'static + Message>(
             rust_name: &'static str,
-            fields: Vec<&'static FieldAccessor<M> + 'static>,
+            fields: Vec<&'static (FieldAccessor<M> + 'static)>,
             file: &'static FileDescriptorProto
         ) -> MessageDescriptor
     {

diff --git a/src/lib/stream.rs b/src/lib/stream.rs
@@ -89,7 +89,7 @@ pub struct CodedInputStream<'a> {
     buffer: MaybeOwnedSlice<'a, u8>,
     buffer_size: u32,
     buffer_pos: u32,
-    reader: Option<&'a mut Reader + 'a>,
+    reader: Option<&'a mut (Reader + 'a)>,
     total_bytes_retired: u32,
     current_limit: u32,
     buffer_size_after_limit: u32,
@@ -625,7 +625,7 @@ pub trait WithCodedOutputStream {
             -> ProtobufResult<T>;
 }
 
-impl<'a> WithCodedOutputStream for &'a mut Writer + 'a {
+impl<'a> WithCodedOutputStream for &'a mut (Writer + 'a) {
     fn with_coded_output_stream<T>(self, cb: |&mut CodedOutputStream| -> ProtobufResult<T>)
             -> ProtobufResult<T>
     {
@@ -661,7 +661,7 @@ pub trait WithCodedInputStream {
     fn with_coded_input_stream<T>(self, cb: |&mut CodedInputStream| -> T) -> T;
 }
 
-impl<'a> WithCodedInputStream for &'a mut Reader + 'a {
+impl<'a> WithCodedInputStream for &'a mut (Reader + 'a) {
     fn with_coded_input_stream<T>(self, cb: |&mut CodedInputStream| -> T) -> T {
         let mut is = CodedInputStream::new(self);
         let r = cb(&mut is);
@@ -687,7 +687,7 @@ pub struct CodedOutputStream<'a> {
     buffer: Vec<u8>,
     // within buffer
     position: u32,
-    writer: Option<&'a mut Writer + 'a>,
+    writer: Option<&'a mut (Writer + 'a)>,
 }
 
 impl<'a> CodedOutputStream<'a> {