attempt to avoid conflict of common resource name

src/generator/templates/api/api.rs.mako

@@ -5,7 +5,7 @@
 <%namespace name="schema" file="lib/schema.mako"/>\
 <%
     from generator.lib.util import (new_context, rust_comment, rust_doc_comment, rust_module_doc_comment,
-                      rb_type, hub_type, mangle_ident, hub_type_params_s, 
+                      rb_type, hub_type, mangle_ident, hub_type_params_s,
                       rb_type_params_s, find_fattest_resource, HUB_TYPE_PARAMETERS, METHODS_RESOURCE,
                       UNUSED_TYPE_MARKER, schema_markers)
 
@@ -26,7 +26,6 @@ use std::fs;
 use std::mem;
 use std::thread::sleep;
 
-use http::Uri;
 use hyper::client::connect;
 use tokio::io::{AsyncRead, AsyncWrite};
 use tower_service;

src/generator/templates/api/lib/mbuild.mako

@@ -134,7 +134,7 @@ impl${mb_tparams} ${CALL_BUILDER_MARKERT_TRAIT} for ${ThisType} {}
 
 impl${mb_tparams} ${ThisType}
 where
-    S: tower_service::Service<Uri> + Clone + Send + Sync + 'static,
+    S: tower_service::Service<http::Uri> + Clone + Send + Sync + 'static,
     S::Response: hyper::client::connect::Connection + AsyncRead + AsyncWrite + Send + Unpin + 'static,
     S::Future: Send + Unpin + 'static,
     S::Error: Into<Box<dyn StdError + Send + Sync>>,
@@ -809,7 +809,7 @@ else {
 ;
 
                 client.request(request.unwrap()).await
-                
+
 </%block>\
                 % if resumable_media_param:
             }