From c3c258dfaf3d282471852ae3a6d7ef00c85ec724 Mon Sep 17 00:00:00 2001
From: Paul Lietar <paul@lietar.net>
Date: Mon, 22 Feb 2016 05:48:58 +0000
Subject: [PATCH] Bump protobuf-macros version and use the simpler string
 literal syntax

---
 Cargo.lock   | 14 +++++++++++---
 src/spirc.rs | 26 +++++++++++++-------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bc0551a3..ce80e86e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,7 +13,7 @@ dependencies = [
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "portaudio 0.2.0 (git+https://github.com/mvdnes/portaudio-rs)",
  "protobuf 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "protobuf_macros 0.1.2 (git+https://github.com/plietar/rust-protobuf-macros.git)",
+ "protobuf_macros 0.2.0 (git+https://github.com/plietar/rust-protobuf-macros.git)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rpassword 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-crypto 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -32,6 +32,11 @@ name = "ascii"
 version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "aster"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bit-set"
 version = "0.2.0"
@@ -279,8 +284,11 @@ dependencies = [
 
 [[package]]
 name = "protobuf_macros"
-version = "0.1.2"
-source = "git+https://github.com/plietar/rust-protobuf-macros.git#37c6a34e6024059e1781058a0f0a3af7a783b094"
+version = "0.2.0"
+source = "git+https://github.com/plietar/rust-protobuf-macros.git#5853fc344d506728fa497eaccb83f0a8a82f9150"
+dependencies = [
+ "aster 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "rand"
diff --git a/src/spirc.rs b/src/spirc.rs
index e22a70b2..c147e4c4 100644
--- a/src/spirc.rs
+++ b/src/spirc.rs
@@ -358,23 +358,23 @@ impl SpircInternal {
                 @{
                     typ: protocol::spirc::CapabilityType::kSupportedContexts,
                     stringValue => [
-                        "album".to_owned(),
-                        "playlist".to_owned(),
-                        "search".to_owned(),
-                        "inbox".to_owned(),
-                        "toplist".to_owned(),
-                        "starred".to_owned(),
-                        "publishedstarred".to_owned(),
-                        "track".to_owned(),
+                        "album",
+                        "playlist",
+                        "search",
+                        "inbox",
+                        "toplist",
+                        "starred",
+                        "publishedstarred",
+                        "track",
                     ]
                 },
                 @{
                     typ: protocol::spirc::CapabilityType::kSupportedTypes,
                     stringValue => [
-                        "audio/local".to_owned(),
-                        "audio/track".to_owned(),
-                        "local".to_owned(),
-                        "track".to_owned(),
+                        "audio/local",
+                        "audio/track",
+                        "local",
+                        "track",
                     ]
                 }
             ],
@@ -430,7 +430,7 @@ impl<'a> CommandSender<'a> {
         let mut pkt = protobuf_init!(protocol::spirc::Frame::new(), {
             version: 1,
             ident: self.spirc_internal.ident.clone(),
-            protocol_version: "2.0.0".to_owned(),
+            protocol_version: "2.0.0",
             seq_nr: { self.spirc_internal.seq_nr += 1; self.spirc_internal.seq_nr  },
             typ: self.cmd,
             recipient: RepeatedField::from_vec(