diff --git a/.gitignore b/.gitignore index ea8c4bf..1edc9c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +/archive diff --git a/Cargo.lock b/Cargo.lock index 0237dc6..65aa5a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -798,13 +798,11 @@ dependencies = [ "itertools", "log", "once_cell", - "quote", "reqwest", "serde", "serde_json", "serde_tuple", "shadow-rs", - "syn", "tokio", "tracing", "tracing-subscriber", diff --git a/Cargo.toml b/Cargo.toml index d274c4d..f1b7ecb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ authors = ["Yu-Fu Fu "] description = "CLI for FastMail MaskedEmail" [lib] -proc-macro = true # [[bin]] # name = "maskedemail" @@ -27,13 +26,11 @@ futures = "0.3.25" itertools = "0.10.5" log = "0.4.17" once_cell = "1.16.0" -quote = "1.0.21" reqwest = { version = "0.11.13", features = ["blocking", "json"] } serde = { version = "1.0.147", features = ["derive"] } serde_json = "1.0.88" serde_tuple = "0.5.0" shadow-rs = "0.17.1" -syn = "1.0.103" tokio = { version = "1.22.0", features = ["full"] } tracing = "0.1" tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } diff --git a/src/lib.rs b/src/lib.rs index 8b94e26..8b13789 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,24 +1 @@ -extern crate proc_macro; -use proc_macro::TokenStream; -use quote::quote; -use syn::{parse_macro_input, ItemFn}; - -#[proc_macro_attribute] -pub fn with_client(_args: TokenStream, stream: TokenStream) -> TokenStream { - let input = parse_macro_input!(stream as ItemFn); - let ItemFn { - attrs, - vis, - sig, - block, - } = input; - let stmts = &block.stmts; - let ret = quote! { - #(#attrs)* #vis #sig { - let client = get_client(); - #(#stmts)* - } - }; - ret.into() -} diff --git a/src/main.rs b/src/main.rs index 0603085..ccbf9c6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -35,12 +35,6 @@ fn get_api_token() -> &'static String { &CONFIG.get().unwrap().api_token } -static CLIENT: OnceCell = OnceCell::new(); - -fn get_client() -> &'static reqwest::Client { - &CLIENT.get().unwrap() -} - #[derive(Parser, Debug)] #[clap(author, version, about)] pub struct Args {