From e7721ce53bafc70ea4de3d14920739649c06c492 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Sun, 17 Jul 2016 13:56:25 +0200
Subject: [PATCH] chore(cleanup): remove workaround marker

... and some left-over comments.

The workaround code is actually more readable than the previous version,
so it may as well stay.

Fixes #109
---
 gen/groupsmigration1/src/cmn.rs | 18 ------------------
 src/rust/api/cmn.rs             | 18 ------------------
 2 files changed, 36 deletions(-)

diff --git a/gen/groupsmigration1/src/cmn.rs b/gen/groupsmigration1/src/cmn.rs
index c69621da55..d75063e466 100644
--- a/gen/groupsmigration1/src/cmn.rs
+++ b/gen/groupsmigration1/src/cmn.rs
@@ -480,23 +480,6 @@ impl<'a> Read for MultiPartReader<'a> {
     }
 }
 
-// The following macro invocation needs to be expanded, as `include!`
-// doens't support external macros
-// header!{
-//     #[doc="The `X-Upload-Content-Type` header."]
-//     (XUploadContentType, "X-Upload-Content-Type") => [Mime]
-
-//     xupload_content_type {
-//         test_header!(
-//             test1,
-//             vec![b"text/plain"],
-//             Some(HeaderField(
-//                 vec![Mime(TopLevel::Text, SubLevel::Plain, Vec::new())]
-//                 )));
-
-//     }
-// }
-
 /// The `X-Upload-Content-Type` header.
 ///
 /// Generated via rustc --pretty expanded -Z unstable-options, and manually
@@ -711,7 +694,6 @@ impl<'a, A> ResumableUploadHelper<'a, A>
             if self.delegate.cancel_chunk_upload(&range_header) {
                 return None
             }
-            // workaround https://github.com/rust-lang/rust/issues/22252
             let res = self.client.post(self.url)
                                  .header(range_header)
                                  .header(ContentType(self.media_type.clone()))
diff --git a/src/rust/api/cmn.rs b/src/rust/api/cmn.rs
index da89bc99e8..782f0fdd3b 100644
--- a/src/rust/api/cmn.rs
+++ b/src/rust/api/cmn.rs
@@ -478,23 +478,6 @@ impl<'a> Read for MultiPartReader<'a> {
     }
 }
 
-// The following macro invocation needs to be expanded, as `include!`
-// doens't support external macros
-// header!{
-//     #[doc="The `X-Upload-Content-Type` header."]
-//     (XUploadContentType, "X-Upload-Content-Type") => [Mime]
-
-//     xupload_content_type {
-//         test_header!(
-//             test1,
-//             vec![b"text/plain"],
-//             Some(HeaderField(
-//                 vec![Mime(TopLevel::Text, SubLevel::Plain, Vec::new())]
-//                 )));
-
-//     }
-// }
-
 /// The `X-Upload-Content-Type` header.
 ///
 /// Generated via rustc --pretty expanded -Z unstable-options, and manually
@@ -709,7 +692,6 @@ impl<'a, A> ResumableUploadHelper<'a, A>
             if self.delegate.cancel_chunk_upload(&range_header) {
                 return None
             }
-            // workaround https://github.com/rust-lang/rust/issues/22252
             let res = self.client.post(self.url)
                                  .header(range_header)
                                  .header(ContentType(self.media_type.clone()))