diff --git a/src/lib.rs b/src/lib.rs index 8c29974..8c6aa46 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -48,10 +48,10 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream { impl #name { pub async fn send( &self, - client: std::sync::Arc, + client: std::sync::Arc, headers: Option>, api_key: Option<&str>, - ) -> Result { + ) -> Result { use urlencoding::encode; let mut query_params: Vec<(String, String)> = Vec::new(); @@ -103,10 +103,10 @@ pub fn derive_http_get_request(input: TokenStream) -> TokenStream { impl #name { pub async fn send( &self, - client: std::sync::Arc, + client: std::sync::Arc, headers: Option>, api_key: Option<&str>, - ) -> Result { + ) -> Result { match self { #(#variant_arms)* } @@ -128,7 +128,7 @@ pub fn derive_http_response(input: TokenStream) -> TokenStream { let expanded = quote! { impl #name { - pub async fn receive(resp: awc::ClientResponse) -> Result { + pub async fn receive(resp: actix_web::ClientResponse) -> Result { resp.json().await } } @@ -147,10 +147,10 @@ pub fn derive_send_vec(input: TokenStream) -> TokenStream { /// Sends all items in the vec sequentially, awaiting each. pub async fn send_vec( items: Vec, - client: std::sync::Arc, + client: std::sync::Arc, headers: Option>, api_key: Option<&str>, - ) -> Result, awc::error::SendRequestError> { + ) -> Result, actix_web::error::SendRequestError> { let mut responses = Vec::with_capacity(items.len()); for item in items { let resp = item.send(client.clone(), headers.clone(), api_key).await?; @@ -174,8 +174,8 @@ pub fn derive_response_vec(input: TokenStream) -> TokenStream { /// Deserializes all responses sequentially into a Vec. /// Assumes `Self` implements `DeserializeOwned`. pub async fn response_vec( - responses: Vec, - ) -> Result, awc::error::JsonPayloadError> + responses: Vec, + ) -> Result, actix_web::error::JsonPayloadError> where Self: Sized + serde::de::DeserializeOwned, { @@ -231,7 +231,7 @@ pub fn alpaca_cli(_attr: TokenStream, item: TokenStream) -> TokenStream { const THREADS: usize = 4; // Initialize shared HTTP client and API key - let client = Arc::new(awc::Client::default()); + let client = Arc::new(actix_web::Client::default()); let api_key = std::env::var("APCA_API_KEY_ID")?; let cmd = #enum_name::from_args();