Namespace http method to avoid conflict with the capabilities API

Author: swallez

api_generator/src/generator/code_gen/mod.rs

@@ -37,11 +37,11 @@ pub fn use_declarations() -> Tokens {
             params::*,
             error::Error,
             http::{
+                self,
                 headers::{HeaderName, HeaderMap, HeaderValue, CONTENT_TYPE, ACCEPT},
-                Method,
                 request::{Body, NdBody, JsonBody, PARTS_ENCODED},
                 response::Response,
-                transport::Transport,
+                transport::Transport
             },
         };
         use std::{

api_generator/src/generator/code_gen/request/request_builder.rs

@@ -103,14 +103,14 @@ impl<'a> RequestBuilder<'a> {
             _ => match methods.as_slice() {
                 [HttpMethod::Post, HttpMethod::Put] => {
                     if builder_name.contains("Put") {
-                        parse_expr(quote!(Method::Put))
+                        parse_expr(quote!(http::Method::Put))
                     } else {
-                        parse_expr(quote!(Method::Post))
+                        parse_expr(quote!(http::Method::Post))
                     }
                 }
                 [HttpMethod::Get, HttpMethod::Post] => parse_expr(quote!(match self.body {
-                    Some(_) => Method::Post,
-                    None => Method::Get,
+                    Some(_) => http::Method::Post,
+                    None => http::Method::Get,
                 })),
                 _ => panic!("Combination of methods unexpected"),
             },

api_generator/src/generator/mod.rs

@@ -42,7 +42,6 @@ use void::Void;
 pub mod code_gen;
 pub mod output;
 
-use itertools::Itertools;
 use output::{merge_file, write_file};
 use std::cmp::Ordering;
 
@@ -111,6 +110,8 @@ pub enum HttpMethod {
 /// a `Method` in the elasticsearch client
 impl quote::ToTokens for HttpMethod {
     fn to_tokens(&self, tokens: &mut quote::Tokens) {
+        tokens.append("http");
+        tokens.append("::");
         tokens.append("Method");
         tokens.append("::");
         match *self {
@@ -702,7 +703,7 @@ where
         .paths
         .iter()
         .map(|p| &p.deprecated)
-        .fold1(|d1, d2| Deprecated::combine(d1, d2))
+        .reduce(|d1, d2| Deprecated::combine(d1, d2))
         .unwrap_or(&None);
 
     if let Some(deprecated) = deprecation {