|  | @@ -1,4 +1,4 @@
 | 
	
		
			
				|  |  | -// This file is generated. Do not edit
 | 
	
		
			
				|  |  | +// This file is generated by rust-protobuf 2.0.5. Do not edit
 | 
	
		
			
				|  |  |  // @generated
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  // https://github.com/Manishearth/rust-clippy/issues/702
 | 
	
	
		
			
				|  | @@ -32,24 +32,11 @@ pub struct Subscription {
 | 
	
		
			
				|  |  |      cached_size: ::protobuf::CachedSize,
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -// see codegen.rs for the explanation why impl Sync explicitly
 | 
	
		
			
				|  |  | -unsafe impl ::std::marker::Sync for Subscription {}
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |  impl Subscription {
 | 
	
		
			
				|  |  |      pub fn new() -> Subscription {
 | 
	
		
			
				|  |  |          ::std::default::Default::default()
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    pub fn default_instance() -> &'static Subscription {
 | 
	
		
			
				|  |  | -        static mut instance: ::protobuf::lazy::Lazy<Subscription> = ::protobuf::lazy::Lazy {
 | 
	
		
			
				|  |  | -            lock: ::protobuf::lazy::ONCE_INIT,
 | 
	
		
			
				|  |  | -            ptr: 0 as *const Subscription,
 | 
	
		
			
				|  |  | -        };
 | 
	
		
			
				|  |  | -        unsafe {
 | 
	
		
			
				|  |  | -            instance.get(Subscription::new)
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |      // optional string uri = 1;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      pub fn clear_uri(&mut self) {
 | 
	
	
		
			
				|  | @@ -70,7 +57,7 @@ impl Subscription {
 | 
	
		
			
				|  |  |      pub fn mut_uri(&mut self) -> &mut ::std::string::String {
 | 
	
		
			
				|  |  |          if self.uri.is_none() {
 | 
	
		
			
				|  |  |              self.uri.set_default();
 | 
	
		
			
				|  |  | -        };
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          self.uri.as_mut().unwrap()
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -86,14 +73,6 @@ impl Subscription {
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    fn get_uri_for_reflect(&self) -> &::protobuf::SingularField<::std::string::String> {
 | 
	
		
			
				|  |  | -        &self.uri
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -    fn mut_uri_for_reflect(&mut self) -> &mut ::protobuf::SingularField<::std::string::String> {
 | 
	
		
			
				|  |  | -        &mut self.uri
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |      // optional int32 expiry = 2;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      pub fn clear_expiry(&mut self) {
 | 
	
	
		
			
				|  | @@ -113,14 +92,6 @@ impl Subscription {
 | 
	
		
			
				|  |  |          self.expiry.unwrap_or(0)
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    fn get_expiry_for_reflect(&self) -> &::std::option::Option<i32> {
 | 
	
		
			
				|  |  | -        &self.expiry
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -    fn mut_expiry_for_reflect(&mut self) -> &mut ::std::option::Option<i32> {
 | 
	
		
			
				|  |  | -        &mut self.expiry
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |      // optional int32 status_code = 3;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      pub fn clear_status_code(&mut self) {
 | 
	
	
		
			
				|  | @@ -139,14 +110,6 @@ impl Subscription {
 | 
	
		
			
				|  |  |      pub fn get_status_code(&self) -> i32 {
 | 
	
		
			
				|  |  |          self.status_code.unwrap_or(0)
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -    fn get_status_code_for_reflect(&self) -> &::std::option::Option<i32> {
 | 
	
		
			
				|  |  | -        &self.status_code
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -    fn mut_status_code_for_reflect(&mut self) -> &mut ::std::option::Option<i32> {
 | 
	
		
			
				|  |  | -        &mut self.status_code
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  impl ::protobuf::Message for Subscription {
 | 
	
	
		
			
				|  | @@ -164,14 +127,14 @@ impl ::protobuf::Message for Subscription {
 | 
	
		
			
				|  |  |                  2 => {
 | 
	
		
			
				|  |  |                      if wire_type != ::protobuf::wire_format::WireTypeVarint {
 | 
	
		
			
				|  |  |                          return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type));
 | 
	
		
			
				|  |  | -                    };
 | 
	
		
			
				|  |  | +                    }
 | 
	
		
			
				|  |  |                      let tmp = is.read_int32()?;
 | 
	
		
			
				|  |  |                      self.expiry = ::std::option::Option::Some(tmp);
 | 
	
		
			
				|  |  |                  },
 | 
	
		
			
				|  |  |                  3 => {
 | 
	
		
			
				|  |  |                      if wire_type != ::protobuf::wire_format::WireTypeVarint {
 | 
	
		
			
				|  |  |                          return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type));
 | 
	
		
			
				|  |  | -                    };
 | 
	
		
			
				|  |  | +                    }
 | 
	
		
			
				|  |  |                      let tmp = is.read_int32()?;
 | 
	
		
			
				|  |  |                      self.status_code = ::std::option::Option::Some(tmp);
 | 
	
		
			
				|  |  |                  },
 | 
	
	
		
			
				|  | @@ -187,30 +150,30 @@ impl ::protobuf::Message for Subscription {
 | 
	
		
			
				|  |  |      #[allow(unused_variables)]
 | 
	
		
			
				|  |  |      fn compute_size(&self) -> u32 {
 | 
	
		
			
				|  |  |          let mut my_size = 0;
 | 
	
		
			
				|  |  | -        if let Some(v) = self.uri.as_ref() {
 | 
	
		
			
				|  |  | +        if let Some(ref v) = self.uri.as_ref() {
 | 
	
		
			
				|  |  |              my_size += ::protobuf::rt::string_size(1, &v);
 | 
	
		
			
				|  |  | -        };
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          if let Some(v) = self.expiry {
 | 
	
		
			
				|  |  |              my_size += ::protobuf::rt::value_size(2, v, ::protobuf::wire_format::WireTypeVarint);
 | 
	
		
			
				|  |  | -        };
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          if let Some(v) = self.status_code {
 | 
	
		
			
				|  |  |              my_size += ::protobuf::rt::value_size(3, v, ::protobuf::wire_format::WireTypeVarint);
 | 
	
		
			
				|  |  | -        };
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields());
 | 
	
		
			
				|  |  |          self.cached_size.set(my_size);
 | 
	
		
			
				|  |  |          my_size
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream) -> ::protobuf::ProtobufResult<()> {
 | 
	
		
			
				|  |  | -        if let Some(v) = self.uri.as_ref() {
 | 
	
		
			
				|  |  | +        if let Some(ref v) = self.uri.as_ref() {
 | 
	
		
			
				|  |  |              os.write_string(1, &v)?;
 | 
	
		
			
				|  |  | -        };
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          if let Some(v) = self.expiry {
 | 
	
		
			
				|  |  |              os.write_int32(2, v)?;
 | 
	
		
			
				|  |  | -        };
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          if let Some(v) = self.status_code {
 | 
	
		
			
				|  |  |              os.write_int32(3, v)?;
 | 
	
		
			
				|  |  | -        };
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |          os.write_unknown_fields(self.get_unknown_fields())?;
 | 
	
		
			
				|  |  |          ::std::result::Result::Ok(())
 | 
	
		
			
				|  |  |      }
 | 
	
	
		
			
				|  | @@ -238,16 +201,14 @@ impl ::protobuf::Message for Subscription {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor {
 | 
	
		
			
				|  |  | -        ::protobuf::MessageStatic::descriptor_static(None::<Self>)
 | 
	
		
			
				|  |  | +        Self::descriptor_static()
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | -}
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -impl ::protobuf::MessageStatic for Subscription {
 | 
	
		
			
				|  |  |      fn new() -> Subscription {
 | 
	
		
			
				|  |  |          Subscription::new()
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -    fn descriptor_static(_: ::std::option::Option<Subscription>) -> &'static ::protobuf::reflect::MessageDescriptor {
 | 
	
		
			
				|  |  | +    fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor {
 | 
	
		
			
				|  |  |          static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy {
 | 
	
		
			
				|  |  |              lock: ::protobuf::lazy::ONCE_INIT,
 | 
	
		
			
				|  |  |              ptr: 0 as *const ::protobuf::reflect::MessageDescriptor,
 | 
	
	
		
			
				|  | @@ -257,18 +218,18 @@ impl ::protobuf::MessageStatic for Subscription {
 | 
	
		
			
				|  |  |                  let mut fields = ::std::vec::Vec::new();
 | 
	
		
			
				|  |  |                  fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>(
 | 
	
		
			
				|  |  |                      "uri",
 | 
	
		
			
				|  |  | -                    Subscription::get_uri_for_reflect,
 | 
	
		
			
				|  |  | -                    Subscription::mut_uri_for_reflect,
 | 
	
		
			
				|  |  | +                    |m: &Subscription| { &m.uri },
 | 
	
		
			
				|  |  | +                    |m: &mut Subscription| { &mut m.uri },
 | 
	
		
			
				|  |  |                  ));
 | 
	
		
			
				|  |  |                  fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>(
 | 
	
		
			
				|  |  |                      "expiry",
 | 
	
		
			
				|  |  | -                    Subscription::get_expiry_for_reflect,
 | 
	
		
			
				|  |  | -                    Subscription::mut_expiry_for_reflect,
 | 
	
		
			
				|  |  | +                    |m: &Subscription| { &m.expiry },
 | 
	
		
			
				|  |  | +                    |m: &mut Subscription| { &mut m.expiry },
 | 
	
		
			
				|  |  |                  ));
 | 
	
		
			
				|  |  |                  fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>(
 | 
	
		
			
				|  |  |                      "status_code",
 | 
	
		
			
				|  |  | -                    Subscription::get_status_code_for_reflect,
 | 
	
		
			
				|  |  | -                    Subscription::mut_status_code_for_reflect,
 | 
	
		
			
				|  |  | +                    |m: &Subscription| { &m.status_code },
 | 
	
		
			
				|  |  | +                    |m: &mut Subscription| { &mut m.status_code },
 | 
	
		
			
				|  |  |                  ));
 | 
	
		
			
				|  |  |                  ::protobuf::reflect::MessageDescriptor::new::<Subscription>(
 | 
	
		
			
				|  |  |                      "Subscription",
 | 
	
	
		
			
				|  | @@ -278,6 +239,16 @@ impl ::protobuf::MessageStatic for Subscription {
 | 
	
		
			
				|  |  |              })
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    fn default_instance() -> &'static Subscription {
 | 
	
		
			
				|  |  | +        static mut instance: ::protobuf::lazy::Lazy<Subscription> = ::protobuf::lazy::Lazy {
 | 
	
		
			
				|  |  | +            lock: ::protobuf::lazy::ONCE_INIT,
 | 
	
		
			
				|  |  | +            ptr: 0 as *const Subscription,
 | 
	
		
			
				|  |  | +        };
 | 
	
		
			
				|  |  | +        unsafe {
 | 
	
		
			
				|  |  | +            instance.get(Subscription::new)
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  impl ::protobuf::Clear for Subscription {
 | 
	
	
		
			
				|  | @@ -301,31 +272,11 @@ impl ::protobuf::reflect::ProtobufValue for Subscription {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -static file_descriptor_proto_data: &'static [u8] = &[
 | 
	
		
			
				|  |  | -    0x0a, 0x0c, 0x70, 0x75, 0x62, 0x73, 0x75, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x59,
 | 
	
		
			
				|  |  | -    0x0a, 0x0c, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10,
 | 
	
		
			
				|  |  | -    0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x69,
 | 
	
		
			
				|  |  | -    0x12, 0x16, 0x0a, 0x06, 0x65, 0x78, 0x70, 0x69, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
 | 
	
		
			
				|  |  | -    0x52, 0x06, 0x65, 0x78, 0x70, 0x69, 0x72, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x61, 0x74,
 | 
	
		
			
				|  |  | -    0x75, 0x73, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73,
 | 
	
		
			
				|  |  | -    0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x4a, 0xf9, 0x01, 0x0a, 0x06, 0x12, 0x04,
 | 
	
		
			
				|  |  | -    0x00, 0x00, 0x06, 0x01, 0x0a, 0x08, 0x0a, 0x01, 0x0c, 0x12, 0x03, 0x00, 0x00, 0x12, 0x0a, 0x0a,
 | 
	
		
			
				|  |  | -    0x0a, 0x02, 0x04, 0x00, 0x12, 0x04, 0x02, 0x00, 0x06, 0x01, 0x0a, 0x0a, 0x0a, 0x03, 0x04, 0x00,
 | 
	
		
			
				|  |  | -    0x01, 0x12, 0x03, 0x02, 0x08, 0x14, 0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x00, 0x12, 0x03,
 | 
	
		
			
				|  |  | -    0x03, 0x04, 0x1e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x04, 0x12, 0x03, 0x03, 0x04,
 | 
	
		
			
				|  |  | -    0x0c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x05, 0x12, 0x03, 0x03, 0x0d, 0x13, 0x0a,
 | 
	
		
			
				|  |  | -    0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x00, 0x01, 0x12, 0x03, 0x03, 0x14, 0x17, 0x0a, 0x0c, 0x0a,
 | 
	
		
			
				|  |  | -    0x05, 0x04, 0x00, 0x02, 0x00, 0x03, 0x12, 0x03, 0x03, 0x1a, 0x1d, 0x0a, 0x0b, 0x0a, 0x04, 0x04,
 | 
	
		
			
				|  |  | -    0x00, 0x02, 0x01, 0x12, 0x03, 0x04, 0x04, 0x20, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01,
 | 
	
		
			
				|  |  | -    0x04, 0x12, 0x03, 0x04, 0x04, 0x0c, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x05, 0x12,
 | 
	
		
			
				|  |  | -    0x03, 0x04, 0x0d, 0x12, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x01, 0x12, 0x03, 0x04,
 | 
	
		
			
				|  |  | -    0x13, 0x19, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x01, 0x03, 0x12, 0x03, 0x04, 0x1c, 0x1f,
 | 
	
		
			
				|  |  | -    0x0a, 0x0b, 0x0a, 0x04, 0x04, 0x00, 0x02, 0x02, 0x12, 0x03, 0x05, 0x04, 0x25, 0x0a, 0x0c, 0x0a,
 | 
	
		
			
				|  |  | -    0x05, 0x04, 0x00, 0x02, 0x02, 0x04, 0x12, 0x03, 0x05, 0x04, 0x0c, 0x0a, 0x0c, 0x0a, 0x05, 0x04,
 | 
	
		
			
				|  |  | -    0x00, 0x02, 0x02, 0x05, 0x12, 0x03, 0x05, 0x0d, 0x12, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02,
 | 
	
		
			
				|  |  | -    0x02, 0x01, 0x12, 0x03, 0x05, 0x13, 0x1e, 0x0a, 0x0c, 0x0a, 0x05, 0x04, 0x00, 0x02, 0x02, 0x03,
 | 
	
		
			
				|  |  | -    0x12, 0x03, 0x05, 0x21, 0x24,
 | 
	
		
			
				|  |  | -];
 | 
	
		
			
				|  |  | +static file_descriptor_proto_data: &'static [u8] = b"\
 | 
	
		
			
				|  |  | +    \n\x0cpubsub.proto\"Y\n\x0cSubscription\x12\x10\n\x03uri\x18\x01\x20\x01\
 | 
	
		
			
				|  |  | +    (\tR\x03uri\x12\x16\n\x06expiry\x18\x02\x20\x01(\x05R\x06expiry\x12\x1f\
 | 
	
		
			
				|  |  | +    \n\x0bstatus_code\x18\x03\x20\x01(\x05R\nstatusCode\
 | 
	
		
			
				|  |  | +";
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
 | 
	
		
			
				|  |  |      lock: ::protobuf::lazy::ONCE_INIT,
 |