Include pre-generated protocol files.

A build script is used to ensure the source files haven’t been modified.

Cargo.lock

@@ -322,7 +322,6 @@ name = "librespot-protocol"
 version = "0.1.0"
 dependencies = [
  "protobuf 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf_build 0.1.1 (git+https://github.com/plietar/rust-protobuf-build.git)",
 ]
 
 [[package]]
@@ -615,17 +614,6 @@ name = "protobuf"
 version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "protobuf_build"
-version = "0.1.1"
-source = "git+https://github.com/plietar/rust-protobuf-build.git#24d5a01ca035d0c00a3fae7ce5e26b6d2e68ddcb"
-dependencies = [
- "gcc 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "protobuf_macros"
 version = "0.6.0"
@@ -1324,7 +1312,6 @@ dependencies = [
 "checksum portaudio 0.2.0 (git+https://github.com/mvdnes/portaudio-rs)" = "<none>"
 "checksum portaudio_sys 0.1.1 (git+https://github.com/mvdnes/portaudio-rs)" = "<none>"
 "checksum protobuf 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "6ec4c2fe04370298218a09ab53a534febf54c160c5554e4de987b6d73c916d5d"
-"checksum protobuf_build 0.1.1 (git+https://github.com/plietar/rust-protobuf-build.git)" = "<none>"
 "checksum protobuf_macros 0.6.0 (git+https://github.com/plietar/rust-protobuf-macros)" = "<none>"
 "checksum quasi 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621ed00c72a1279d3272b5ad7137302e8f493ba19f726dcb5a3c7c9774972a64"
 "checksum quasi 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "314e56e9e59af71a5b1f09fab15e8e66ab2ccb786688f8d2e04d98b8d7cbc161"

README.md

@@ -11,21 +11,21 @@ are however welcome to experiment with it.
 ## Building
 Rust 1.7.0 or later is required to build librespot.
 
-It also requires a C and C++ toolchain, with libprotoc and portaudio.
+It also requires a C, with portaudio.
 
 On debian / ubuntu, the following command will install these dependencies :
 ```shell
-sudo apt-get install build-essential portaudio19-dev libprotoc-dev
+sudo apt-get install build-essential portaudio19-dev
 ```
 
 On Fedora systems, the following command will install these dependencies :
 ```shell
-sudo dnf install portaudio-devel protobuf-devel make gcc gcc-c++
+sudo dnf install portaudio-devel make gcc
 ```
 
 On OS X, using homebrew :
 ```shell
-brew install portaudio protobuf
+brew install portaudio
 ```
 
 Once you've cloned this repository you can build *librespot* using `cargo`.

protocol/Cargo.toml

@@ -5,7 +5,4 @@ authors = ["Paul Liétar <paul@lietar.net>"]
 build = "build.rs"
 
 [dependencies]
-protobuf = "~1.0.10"
+protobuf = "1.0.10"
-
-[build-dependencies.protobuf_build]
-git = "https://github.com/plietar/rust-protobuf-build.git"

protocol/build.rs

@@ -1,42 +1,105 @@
-extern crate protobuf_build;
+use std::io::prelude::*;
-
-use std::env;
-use std::path::PathBuf;
 use std::fs::File;
-use std::io::{Read, Write};
+
+mod files;
 
 fn main() {
-    let root = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+    for &(path, expected_checksum) in files::FILES {
-    let out = PathBuf::from(env::var("OUT_DIR").unwrap());
+        let actual = cksum_file(path).unwrap();
-    let proto = root.join("proto");
+        if expected_checksum != actual {
+            panic!("Checksum for {:?} does not match. Try running build.sh", path);
+        }
+    }
+}
 
-    let mut compiler = protobuf_build::Compiler::new(&proto, &out);
+fn cksum_file<T: AsRef<std::path::Path>>(path: T) -> std::io::Result<u32> {
-
+    let mut file = File::open(path)?;
-    let files = ["keyexchange",
-                 "authentication",
-                 "mercury",
-                 "metadata",
-                 "pubsub",
-                 "spirc"];
-
-    for file in &files {
-        compiler.compile(&((*file).to_owned() + ".proto")).unwrap();
-
-        // Hack for rust-lang/rust#18810
-        // Wrap the generated rust files with "pub mod { ... }", so they
-        // can be included.
-        let path = out.join(&((*file).to_owned() + ".rs"));
-        let contents = {
-            let mut src = File::open(path).unwrap();
     let mut contents = Vec::new();
-            src.read_to_end(&mut contents).unwrap();
+    file.read_to_end(&mut contents)?;
-            contents
-        };
 
-        let mut dst = File::create(out.join(&((*file).to_owned() + ".rs"))).unwrap();
+    Ok(cksum(&contents))
-        dst.write_all(format!("pub mod {} {{\n", file).as_bytes()).unwrap();
-        dst.write_all(&contents).unwrap();
-        dst.write_all("}".as_bytes()).unwrap();
-    }
 }
 
+fn cksum<T: AsRef<[u8]>>(data: T) -> u32 {
+    let data = data.as_ref();
+
+	let mut value = 0u32;
+	for x in data {
+		value = (value << 8) ^ CRC_LOOKUP_ARRAY[(*x as u32 ^ (value >> 24)) as usize];
+	}
+
+    let mut n = data.len();
+    while n != 0 {
+		value = (value << 8) ^ CRC_LOOKUP_ARRAY[((n & 0xFF) as u32 ^ (value >> 24)) as usize];
+        n >>= 8;
+    }
+
+    !value
+}
+
+static CRC_LOOKUP_ARRAY : &'static[u32] = &[
+	0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
+	0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
+	0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+	0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
+	0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9,
+	0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+	0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011,
+	0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
+	0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+	0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
+	0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81,
+	0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+	0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49,
+	0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
+	0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+	0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
+	0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae,
+	0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+	0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
+	0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
+	0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+	0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
+	0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066,
+	0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+	0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e,
+	0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
+	0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+	0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
+	0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
+	0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+	0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686,
+	0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
+	0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+	0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
+	0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f,
+	0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+	0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47,
+	0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
+	0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+	0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
+	0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7,
+	0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+	0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f,
+	0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
+	0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+	0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
+	0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
+	0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+	0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
+	0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
+	0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+	0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
+	0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
+	0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+	0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
+	0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
+	0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+	0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
+	0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
+	0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+	0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
+	0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
+	0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+	0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
+];

protocol/build.sh

@@ -0,0 +1,29 @@
+set -eu
+
+SRC="authentication keyexchange mercury
+     metadata pubsub spirc"
+
+cat > src/lib.rs <<EOF
+// Autogenerated by build.sh
+
+extern crate protobuf;
+EOF
+
+cat > files.rs <<EOF
+// Autogenerated by build.sh
+
+pub const FILES : &'static [(&'static str, u32)] = &[
+EOF
+
+for name in $SRC; do
+  src=proto/$name.proto
+  out=src/$name.rs
+  checksum=$(cksum $src | cut -f 1 -d' ')
+
+  protoc --rust_out src/ -I proto/ proto/$name.proto
+
+  echo "pub mod $name;" >> src/lib.rs
+  echo "    (\"$src\", $checksum)," >> files.rs
+done
+
+echo "];" >> files.rs

protocol/files.rs

@@ -0,0 +1,10 @@
+// Autogenerated by build.sh
+
+pub const FILES : &'static [(&'static str, u32)] = &[
+    ("proto/authentication.proto", 2098196376),
+    ("proto/keyexchange.proto", 451735664),
+    ("proto/mercury.proto", 709993906),
+    ("proto/metadata.proto", 488967056),
+    ("proto/pubsub.proto", 2686584829),
+    ("proto/spirc.proto", 400998103),
+];

protocol/proto/ad-hermes-proxy.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message Rule {
     optional string type = 0x1;
     optional uint32 times = 0x2;

protocol/proto/appstore.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message AppInfo {
     optional string identifier = 0x1;
     optional int32 version_int = 0x2;

protocol/proto/authentication.proto

@@ -1,3 +1,4 @@
+syntax = "proto2";
 
 message ClientResponseEncrypted {
     required LoginCredentials login_credentials = 0xa; 

protocol/proto/facebook-publish.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message EventReply {
     optional int32 queued = 0x1;
     optional RetryInfo retry = 0x2;

protocol/proto/facebook.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message Credential {
     optional string facebook_uid = 0x1;
     optional string access_token = 0x2;

protocol/proto/keyexchange.proto

@@ -1,3 +1,4 @@
+syntax = "proto2";
 
 message ClientHello {
     required BuildInfo build_info = 0xa; 

protocol/proto/mercury.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message MercuryMultiGetRequest {
     repeated MercuryRequest request = 0x1;
 }

protocol/proto/mergedprofile.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message MergedProfileRequest {
 }
 

protocol/proto/metadata.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message TopTracks {
     optional string country = 0x1;
     repeated Track track = 0x2;

protocol/proto/playlist4changes.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 import "playlist4ops.proto";
 import "playlist4meta.proto";
 import "playlist4content.proto";

protocol/proto/playlist4content.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 import "playlist4meta.proto";
 import "playlist4issues.proto";
 

protocol/proto/playlist4issues.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message ClientIssue {
     optional Level level = 0x1;
     enum Level {

protocol/proto/playlist4meta.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message ListChecksum {
     optional int32 version = 0x1;
     optional bytes sha1 = 0x4;

protocol/proto/playlist4ops.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 import "playlist4meta.proto";
 import "playlist4content.proto";
 

protocol/proto/popcount.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message PopcountRequest {
 }
 

protocol/proto/presence.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message PlaylistPublishedState {
     optional string uri = 0x1;
     optional int64 timestamp = 0x2;

protocol/proto/pubsub.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message Subscription {
     optional string uri = 0x1;
     optional int32 expiry = 0x2;

protocol/proto/radio.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message RadioRequest {
     repeated string uris = 0x1;
     optional int32 salt = 0x2;

protocol/proto/search.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message SearchRequest {
     optional string query = 0x1;
     optional Type type = 0x2;

protocol/proto/social.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message DecorationData {
     optional string username = 0x1;
     optional string full_name = 0x2;

protocol/proto/socialgraph.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message CountReply {
     repeated int32 counts = 0x1;
 }

protocol/proto/spirc.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message Frame {
     optional uint32 version = 0x1;
     optional string ident = 0x2;

protocol/proto/suggest.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message Track {
     optional bytes gid = 0x1;
     optional string name = 0x2;

protocol/proto/toplist.proto

@@ -1,3 +1,5 @@
+syntax = "proto2";
+
 message Toplist {
     repeated string items = 0x1;
 }

protocol/src/lib.rs

@@ -1,8 +1,9 @@
-extern crate protobuf;
+// Autogenerated by build.sh
 
-include! (concat!(env!("OUT_DIR"), "/authentication.rs"));
+extern crate protobuf;
-include! (concat!(env!("OUT_DIR"), "/keyexchange.rs"));
+pub mod authentication;
-include! (concat!(env!("OUT_DIR"), "/mercury.rs"));
+pub mod keyexchange;
-include! (concat!(env!("OUT_DIR"), "/metadata.rs"));
+pub mod mercury;
-include! (concat!(env!("OUT_DIR"), "/pubsub.rs"));
+pub mod metadata;
-include! (concat!(env!("OUT_DIR"), "/spirc.rs"));
+pub mod pubsub;
+pub mod spirc;

protocol/src/pubsub.rs

@@ -0,0 +1,329 @@
+// This file is generated. Do not edit
+// @generated
+
+// https://github.com/Manishearth/rust-clippy/issues/702
+#![allow(unknown_lints)]
+#![allow(clippy)]
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+
+#![allow(box_pointers)]
+#![allow(dead_code)]
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+#![allow(non_upper_case_globals)]
+#![allow(trivial_casts)]
+#![allow(unsafe_code)]
+#![allow(unused_imports)]
+#![allow(unused_results)]
+
+use protobuf::Message as Message_imported_for_functions;
+use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions;
+
+#[derive(Clone,Default)]
+pub struct Subscription {
+    // message fields
+    uri: ::protobuf::SingularField<::std::string::String>,
+    expiry: ::std::option::Option<i32>,
+    status_code: ::std::option::Option<i32>,
+    // special fields
+    unknown_fields: ::protobuf::UnknownFields,
+    cached_size: ::std::cell::Cell<u32>,
+}
+
+// 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 {
+                    uri: ::protobuf::SingularField::none(),
+                    expiry: ::std::option::Option::None,
+                    status_code: ::std::option::Option::None,
+                    unknown_fields: ::protobuf::UnknownFields::new(),
+                    cached_size: ::std::cell::Cell::new(0),
+                }
+            })
+        }
+    }
+
+    // optional string uri = 1;
+
+    pub fn clear_uri(&mut self) {
+        self.uri.clear();
+    }
+
+    pub fn has_uri(&self) -> bool {
+        self.uri.is_some()
+    }
+
+    // Param is passed by value, moved
+    pub fn set_uri(&mut self, v: ::std::string::String) {
+        self.uri = ::protobuf::SingularField::some(v);
+    }
+
+    // Mutable pointer to the field.
+    // If field is not initialized, it is initialized with default value first.
+    pub fn mut_uri(&mut self) -> &mut ::std::string::String {
+        if self.uri.is_none() {
+            self.uri.set_default();
+        };
+        self.uri.as_mut().unwrap()
+    }
+
+    // Take field
+    pub fn take_uri(&mut self) -> ::std::string::String {
+        self.uri.take().unwrap_or_else(|| ::std::string::String::new())
+    }
+
+    pub fn get_uri(&self) -> &str {
+        match self.uri.as_ref() {
+            Some(v) => &v,
+            None => "",
+        }
+    }
+
+    // optional int32 expiry = 2;
+
+    pub fn clear_expiry(&mut self) {
+        self.expiry = ::std::option::Option::None;
+    }
+
+    pub fn has_expiry(&self) -> bool {
+        self.expiry.is_some()
+    }
+
+    // Param is passed by value, moved
+    pub fn set_expiry(&mut self, v: i32) {
+        self.expiry = ::std::option::Option::Some(v);
+    }
+
+    pub fn get_expiry(&self) -> i32 {
+        self.expiry.unwrap_or(0)
+    }
+
+    // optional int32 status_code = 3;
+
+    pub fn clear_status_code(&mut self) {
+        self.status_code = ::std::option::Option::None;
+    }
+
+    pub fn has_status_code(&self) -> bool {
+        self.status_code.is_some()
+    }
+
+    // Param is passed by value, moved
+    pub fn set_status_code(&mut self, v: i32) {
+        self.status_code = ::std::option::Option::Some(v);
+    }
+
+    pub fn get_status_code(&self) -> i32 {
+        self.status_code.unwrap_or(0)
+    }
+}
+
+impl ::protobuf::Message for Subscription {
+    fn is_initialized(&self) -> bool {
+        true
+    }
+
+    fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream) -> ::protobuf::ProtobufResult<()> {
+        while !try!(is.eof()) {
+            let (field_number, wire_type) = try!(is.read_tag_unpack());
+            match field_number {
+                1 => {
+                    try!(::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.uri));
+                },
+                2 => {
+                    if wire_type != ::protobuf::wire_format::WireTypeVarint {
+                        return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type));
+                    };
+                    let tmp = try!(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 = try!(is.read_int32());
+                    self.status_code = ::std::option::Option::Some(tmp);
+                },
+                _ => {
+                    try!(::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields()));
+                },
+            };
+        }
+        ::std::result::Result::Ok(())
+    }
+
+    // Compute sizes of nested messages
+    #[allow(unused_variables)]
+    fn compute_size(&self) -> u32 {
+        let mut my_size = 0;
+        for value in &self.uri {
+            my_size += ::protobuf::rt::string_size(1, &value);
+        };
+        for value in &self.expiry {
+            my_size += ::protobuf::rt::value_size(2, *value, ::protobuf::wire_format::WireTypeVarint);
+        };
+        for value in &self.status_code {
+            my_size += ::protobuf::rt::value_size(3, *value, ::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() {
+            try!(os.write_string(1, &v));
+        };
+        if let Some(v) = self.expiry {
+            try!(os.write_int32(2, v));
+        };
+        if let Some(v) = self.status_code {
+            try!(os.write_int32(3, v));
+        };
+        try!(os.write_unknown_fields(self.get_unknown_fields()));
+        ::std::result::Result::Ok(())
+    }
+
+    fn get_cached_size(&self) -> u32 {
+        self.cached_size.get()
+    }
+
+    fn get_unknown_fields(&self) -> &::protobuf::UnknownFields {
+        &self.unknown_fields
+    }
+
+    fn mut_unknown_fields(&mut self) -> &mut ::protobuf::UnknownFields {
+        &mut self.unknown_fields
+    }
+
+    fn type_id(&self) -> ::std::any::TypeId {
+        ::std::any::TypeId::of::<Subscription>()
+    }
+
+    fn as_any(&self) -> &::std::any::Any {
+        self as &::std::any::Any
+    }
+
+    fn descriptor(&self) -> &'static ::protobuf::reflect::MessageDescriptor {
+        ::protobuf::MessageStatic::descriptor_static(None::<Self>)
+    }
+}
+
+impl ::protobuf::MessageStatic for Subscription {
+    fn new() -> Subscription {
+        Subscription::new()
+    }
+
+    fn descriptor_static(_: ::std::option::Option<Subscription>) -> &'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,
+        };
+        unsafe {
+            descriptor.get(|| {
+                let mut fields = ::std::vec::Vec::new();
+                fields.push(::protobuf::reflect::accessor::make_singular_string_accessor(
+                    "uri",
+                    Subscription::has_uri,
+                    Subscription::get_uri,
+                ));
+                fields.push(::protobuf::reflect::accessor::make_singular_i32_accessor(
+                    "expiry",
+                    Subscription::has_expiry,
+                    Subscription::get_expiry,
+                ));
+                fields.push(::protobuf::reflect::accessor::make_singular_i32_accessor(
+                    "status_code",
+                    Subscription::has_status_code,
+                    Subscription::get_status_code,
+                ));
+                ::protobuf::reflect::MessageDescriptor::new::<Subscription>(
+                    "Subscription",
+                    fields,
+                    file_descriptor_proto()
+                )
+            })
+        }
+    }
+}
+
+impl ::protobuf::Clear for Subscription {
+    fn clear(&mut self) {
+        self.clear_uri();
+        self.clear_expiry();
+        self.clear_status_code();
+        self.unknown_fields.clear();
+    }
+}
+
+impl ::std::cmp::PartialEq for Subscription {
+    fn eq(&self, other: &Subscription) -> bool {
+        self.uri == other.uri &&
+        self.expiry == other.expiry &&
+        self.status_code == other.status_code &&
+        self.unknown_fields == other.unknown_fields
+    }
+}
+
+impl ::std::fmt::Debug for Subscription {
+    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+        ::protobuf::text_format::fmt(self, f)
+    }
+}
+
+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 mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy {
+    lock: ::protobuf::lazy::ONCE_INIT,
+    ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto,
+};
+
+fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto {
+    ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap()
+}
+
+pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto {
+    unsafe {
+        file_descriptor_proto_lazy.get(|| {
+            parse_descriptor_proto()
+        })
+    }
+}