all good
This commit is contained in:
11
src/lib.rs
11
src/lib.rs
@ -1,6 +1,6 @@
|
|||||||
use proc_macro::TokenStream;
|
use proc_macro::TokenStream;
|
||||||
use quote::quote;
|
use quote::quote;
|
||||||
use syn::{parse_macro_input, ItemEnum, DeriveInput, Fields, Data};
|
use syn::{parse_macro_input, Lit, ItemEnum, DeriveInput, Fields, Data};
|
||||||
|
|
||||||
#[proc_macro_derive(HttpRequest, attributes(http_get))]
|
#[proc_macro_derive(HttpRequest, attributes(http_get))]
|
||||||
pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
|
pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
|
||||||
@ -23,6 +23,7 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
let base_url = base_url.expect("Missing #[http_get(url = \"...\")] attribute");
|
let base_url = base_url.expect("Missing #[http_get(url = \"...\")] attribute");
|
||||||
|
let base_url_lit = Lit::Str(syn::LitStr::new(&base_url, proc_macro2::Span::call_site()));
|
||||||
|
|
||||||
let expanded = match &input.data {
|
let expanded = match &input.data {
|
||||||
Data::Struct(data_struct) => {
|
Data::Struct(data_struct) => {
|
||||||
@ -47,7 +48,7 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
|
|||||||
impl Queryable for #name {
|
impl Queryable for #name {
|
||||||
fn send(
|
fn send(
|
||||||
&self,
|
&self,
|
||||||
base_url: &str,
|
_base_url: &str, // not used
|
||||||
headers: Option<Vec<(&str, &str)>>,
|
headers: Option<Vec<(&str, &str)>>,
|
||||||
) -> Result<Response, std::io::Error> {
|
) -> Result<Response, std::io::Error> {
|
||||||
use urlencoding::encode;
|
use urlencoding::encode;
|
||||||
@ -56,7 +57,7 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
|
|||||||
let mut query_params: Vec<(String, String)> = Vec::new();
|
let mut query_params: Vec<(String, String)> = Vec::new();
|
||||||
#(#query_param_code)*
|
#(#query_param_code)*
|
||||||
|
|
||||||
let mut url = base_url.to_string();
|
let mut url = #base_url_lit.to_string();
|
||||||
if !query_params.is_empty() {
|
if !query_params.is_empty() {
|
||||||
let query_parts: Vec<String> = query_params.iter()
|
let query_parts: Vec<String> = query_params.iter()
|
||||||
.map(|(k, v)| format!("{}={}", k, encode(v)))
|
.map(|(k, v)| format!("{}={}", k, encode(v)))
|
||||||
@ -98,7 +99,7 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
|
|||||||
match &variant.fields {
|
match &variant.fields {
|
||||||
Fields::Unnamed(fields) if fields.unnamed.len() == 1 => {
|
Fields::Unnamed(fields) if fields.unnamed.len() == 1 => {
|
||||||
variant_arms.push(quote! {
|
variant_arms.push(quote! {
|
||||||
#name::#vname(inner) => inner.send(base_url, headers.clone()),
|
#name::#vname(inner) => inner.send(#base_url_lit, headers.clone()),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
_ => panic!("#[derive(HttpRequest)] enum variants must have a single unnamed field"),
|
_ => panic!("#[derive(HttpRequest)] enum variants must have a single unnamed field"),
|
||||||
@ -109,7 +110,7 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream {
|
|||||||
impl Queryable for #name {
|
impl Queryable for #name {
|
||||||
fn send(
|
fn send(
|
||||||
&self,
|
&self,
|
||||||
base_url: &str,
|
_base_url: &str, // not used
|
||||||
headers: Option<Vec<(&str, &str)>>,
|
headers: Option<Vec<(&str, &str)>>,
|
||||||
) -> Result<Response, std::io::Error> {
|
) -> Result<Response, std::io::Error> {
|
||||||
match self {
|
match self {
|
||||||
|
Reference in New Issue
Block a user