Fix multiple macro usage

zeritiq · Apr 16, 2023 · 54a0af6 · 54a0af6
1 parent 0e28783
commit 54a0af6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mongodb-macro"
-version = "1.0.2"
+version = "1.0.3"
 edition = "2021"
 description = "MongoDB Macro is a crate with macros for quickly creating structures to work with mongodb"
 keywords = [ "mongodb", "macro", "config", "clap" ]

diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@ Make sure you also add to the project:
 ### Macro: Collection
 ```rust
 
+use clap::Parser;
 use mongodb::bson::Bson;
 
 // env DB_URL should contain a link to the mongodb url
@@ -56,6 +57,7 @@ async fn main() -> std::io::Result<()> {
 ### Macro: Database
 ```rust
 
+use clap::Parser;
 use mongodb::bson::Bson;
 
 // env DB_URL should contain a link to the mongodb url
@@ -79,6 +81,7 @@ async fn main() -> std::io::Result<()> {
 ### Macro: Client
 ```rust
 
+use clap::Parser;
 use mongodb::bson::Bson;
 
 // env DB_URL should contain a link to the mongodb url
@@ -102,6 +105,7 @@ async fn main() -> std::io::Result<()> {
 ### Macro: Config
 ```rust
 
+use clap::Parser;
 use mongodb::bson::Bson;
 
 mongodb_macro::config!(Opts);
@@ -126,6 +130,6 @@ async fn main() -> std::io::Result<()> {
 }
 ```
 
-Current version: 1.0.2
+Current version: 1.0.3
 
 License: MIT
diff --git a/src/client.rs b/src/client.rs
@@ -30,7 +30,6 @@ macro_rules! client_config {
     ($opts:ident) => ($crate::client_config!{$opts; "DB_URL"});
 
     ($opts:ident; $db_url:tt) => {
-        use ::clap::Parser;
 
         #[derive(Clone, Debug, PartialEq, Eq, ::clap::Parser)]
         pub struct $opts {

diff --git a/src/database.rs b/src/database.rs
@@ -32,7 +32,6 @@ macro_rules! database_config {
     ($opts:ident) => ($crate::database_config!{$opts; ("DB_URL", "DB_NAME")});
 
     ($opts:ident; ($db_url:tt, $db_name:tt)) => {
-        use ::clap::Parser;
 
         #[derive(Clone, Debug, PartialEq, Eq, ::clap::Parser)]
         pub struct $opts {

diff --git a/src/lib.rs b/src/lib.rs
@@ -19,6 +19,7 @@ Make sure you also add to the project:
 ## Macro: Collection
 ```no_run
 
+use clap::Parser;
 use mongodb::bson::Bson;
 
 // env DB_URL should contain a link to the mongodb url
@@ -44,6 +45,7 @@ async fn main() -> std::io::Result<()> {
 ## Macro: Database
 ```no_run
 
+use clap::Parser;
 use mongodb::bson::Bson;
 
 // env DB_URL should contain a link to the mongodb url
@@ -67,6 +69,7 @@ async fn main() -> std::io::Result<()> {
 ## Macro: Client
 ```no_run
 
+use clap::Parser;
 use mongodb::bson::Bson;
 
 // env DB_URL should contain a link to the mongodb url
@@ -90,6 +93,7 @@ async fn main() -> std::io::Result<()> {
 ## Macro: Config
 ```no_run
 
+use clap::Parser;
 use mongodb::bson::Bson;
 
 mongodb_macro::config!(Opts);

diff --git a/src/opts.rs b/src/opts.rs
@@ -49,7 +49,6 @@ macro_rules! config {
     ($opts:ident, $prefix:tt) => ($crate::config!{$opts, $prefix; ("DB_URL", "DB_NAME", "COLLECTION_NAME")});
 
     ($opts:ident, $prefix:tt; ($db_url:tt, $db_name:tt, $collection_name:tt)) => {
-        use ::clap::Parser;
 
         #[derive(Clone, Debug, PartialEq, Eq, ::clap::Parser)]
         pub struct $opts {
@@ -71,7 +70,6 @@ macro_rules! config {
     ($opts:ident) => ($crate::config!{$opts; "DB_URL", "DB_NAME", "COLLECTION_NAME"});
 
     ($opts:ident; $db_url:tt, $db_name:tt, $collection_name:tt) => {
-        use ::clap::Parser;
 
         #[derive(Clone, Debug, PartialEq, Eq, ::clap::Parser)]
         pub struct $opts {