From d8fdf9df9f41719f6acb9bf3750aa8069cfab675 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Fri, 17 Apr 2015 07:18:08 +0200
Subject: [PATCH] fix(API): scopes were used illegally

Which caused a compile error. This was fixed by assuring the code
uses the same function to determine whether or not scopes are present
per method.

[skip ci]
---
 gen/genomics1_beta2/src/lib.rs | 1 -
 gen/mirror1/src/lib.rs         | 1 -
 gen/oauth2_v2/src/lib.rs       | 2 --
 src/mako/api/lib/rbuild.mako   | 4 ++--
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gen/genomics1_beta2/src/lib.rs b/gen/genomics1_beta2/src/lib.rs
index d2a6ef81e53..4b08430aa84 100644
--- a/gen/genomics1_beta2/src/lib.rs
+++ b/gen/genomics1_beta2/src/lib.rs
@@ -2794,7 +2794,6 @@ impl<'a, C, A> StreamingVariantStoreMethods<'a, C, A> {
             hub: self.hub,
             _request: request.clone(),
             _delegate: Default::default(),
-            _scopes: Default::default(),
             _additional_params: Default::default(),
         }
     }
diff --git a/gen/mirror1/src/lib.rs b/gen/mirror1/src/lib.rs
index 7d8364f4869..2112c7ea1f9 100644
--- a/gen/mirror1/src/lib.rs
+++ b/gen/mirror1/src/lib.rs
@@ -1519,7 +1519,6 @@ impl<'a, C, A> AccountMethods<'a, C, A> {
             _account_type: account_type.to_string(),
             _account_name: account_name.to_string(),
             _delegate: Default::default(),
-            _scopes: Default::default(),
             _additional_params: Default::default(),
         }
     }
diff --git a/gen/oauth2_v2/src/lib.rs b/gen/oauth2_v2/src/lib.rs
index 479c06f92da..f1a02bc9fa4 100644
--- a/gen/oauth2_v2/src/lib.rs
+++ b/gen/oauth2_v2/src/lib.rs
@@ -565,7 +565,6 @@ impl<'a, C, A> MethodMethods<'a, C, A> {
             _id_token: Default::default(),
             _access_token: Default::default(),
             _delegate: Default::default(),
-            _scopes: Default::default(),
             _additional_params: Default::default(),
         }
     }
@@ -574,7 +573,6 @@ impl<'a, C, A> MethodMethods<'a, C, A> {
         MethodGetCertForOpenIdConnectCall {
             hub: self.hub,
             _delegate: Default::default(),
-            _scopes: Default::default(),
             _additional_params: Default::default(),
         }
     }
diff --git a/src/mako/api/lib/rbuild.mako b/src/mako/api/lib/rbuild.mako
index 8ff389ac24f..9bc42bdcf15 100644
--- a/src/mako/api/lib/rbuild.mako
+++ b/src/mako/api/lib/rbuild.mako
@@ -6,7 +6,7 @@
                       rust_copy_value_s, is_required_property, organize_params, REQUEST_VALUE_PROPERTY_NAME,
                       build_all_params, rb_type_params_s, hub_type_params_s, mb_type_params_s, mb_additional_type_params, 
                       struct_type_bounds_s, METHODS_RESOURCE, SPACES_PER_TAB, prefix_all_but_first_with,
-                      METHODS_BUILDER_MARKER_TRAIT, remove_empty_lines)
+                      METHODS_BUILDER_MARKER_TRAIT, remove_empty_lines, method_default_scope)
 %>\
 <%namespace name="util" file="../../lib/util.mako"/>\
 <%namespace name="lib" file="lib.mako"/>\
@@ -108,7 +108,7 @@ impl${rb_params} ${ThisType} {
             ${property(p.name)}: Default::default(),
             % endfor
 % for prop_key, custom_name in api.properties.iteritems():
-            % if prop_key == 'scopes' and (not auth or not auth.oauth2):
+            % if prop_key == 'scopes' and not method_default_scope(m):
 <% continue %>\
             % endif
             ${custom_name}: Default::default(),