Merge pull request #8 from guenhter/fix-importing

Fix importing

.github/workflows/ci.yml

@@ -17,10 +17,3 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run tests
         run: cargo test --verbose
-      - name: Run core tests
-        run: |
-          cargo test --verbose
-      - name: Run macro tests
-        run: |
-          cd temp_env_vars_macro
-          cargo test --verbose

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "temp_env_vars"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Günther Grill <[email protected]>"]
 edition = "2021"
 rust-version = "1.80"
@@ -14,7 +14,7 @@ categories = ["development-tools::testing"]
 exclude = [".github/", ".vscode/", ".editorconfig", ".gitignore"]
 
 [dependencies]
-temp_env_vars_macro = { version = "0.2.0", path = "./temp_env_vars_macro" }
+temp_env_vars_macro = { version = "0.2.1", path = "./temp_env_vars_macro" }
 
 [dev-dependencies]
 assertor = "0.0.2"

PUBLISHING.md

@@ -8,7 +8,7 @@ Here are some notes when publishing a new version of the crate
 ```bash
 # Publish the macro first
 cd temp_env_vars_macro
-# Comment out the dev-dependency to the temp_env_vars
+sed -i 's/^temp_env_vars/# temp_env_vars/' Cargo.toml
 cargo publish --allow-dirty
 git checkout -- .
 

README.md

@@ -38,6 +38,8 @@ If more tests are used with this macro, those tests will be executed sequentiall
 avoid an enviornment variable mixup.
 
 ```rust
+use temp_env_vars::temp_env_vars;
+
 #[test]
 #[temp_env_vars]
 fn test_some() {
@@ -58,6 +60,9 @@ used to have better control.
 Whenever the created `TempEnvScope` goes out of scope, all env vars are reset.
 
 ```rust
+use serial_test::serial;
+use temp_env_vars::TempEnvScope;
+
 #[test]
 #[serial] // Use external "serial" crate as parallel tests mix up envs
 fn test_some() {

src/lib.rs

@@ -20,6 +20,8 @@
 //! to avoid an enviornment variable mixup.
 //!
 //! ```rust
+//! use temp_env_vars::temp_env_vars;
+//!
 //! #[test]
 //! #[temp_env_vars]
 //! fn test_some() {
@@ -40,6 +42,9 @@
 //! Whenever the created `TempEnvScope` goes out of scope, all env vars are reset.
 //!
 //! ```rust
+//! use serial_test::serial;
+//! use temp_env_vars::TempEnvScope;
+//!
 //! #[test]
 //! #[serial] // Use external "serial" crate as parallel tests mix up envs
 //! fn test_some() {
@@ -62,6 +67,9 @@
 //!     // "FOO" is not longer set here.
 //! }
 //! ```
+
+pub use temp_env_vars_macro::temp_env_vars;
+
 use std::{
     collections::HashMap,
     sync::{Arc, LazyLock, Mutex},
@@ -83,16 +91,16 @@ impl TempEnvScope {
             original_vars: std::env::vars().collect(),
         }
     }
-}
 
-impl Drop for TempEnvScope {
-    fn drop(&mut self) {
-        let mut after: HashMap<String, String> = std::env::vars().collect();
+    /// Sets the environment variables to the state as they were
+    /// when this `TempEnvScope` was created.
+    fn restore(&self) {
+        let mut now: HashMap<String, String> = std::env::vars().collect();
 
         self.original_vars.keys().for_each(|key| {
-            after.remove(key);
+            now.remove(key);
         });
-        after.keys().for_each(|key| {
+        now.keys().for_each(|key| {
             std::env::remove_var(key);
         });
         self.original_vars.iter().for_each(|(k, v)| {
@@ -101,6 +109,12 @@ impl Drop for TempEnvScope {
     }
 }
 
+impl Drop for TempEnvScope {
+    fn drop(&mut self) {
+        self.restore();
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::collections::HashMap;

temp_env_vars_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "temp_env_vars_macro"
-version = "0.2.0"
+version = "0.2.1"
 authors = ["Günther Grill <[email protected]>"]
 edition = "2021"
 rust-version = "1.80"
@@ -21,7 +21,7 @@ syn = { version = "2.0.74", features = ["full"] }
 assertor = "0.0.2"
 serial_test = "3.1.1"
 anyhow = "1.0.86"
-temp_env_vars = { version = "0.2.0", path = ".." }
+temp_env_vars = { version = "0.2.1", path = ".." }
 
 [lib]
 proc-macro = true

temp_env_vars_macro/tests/integration_test.rs → tests/macro_test.rs

@@ -2,7 +2,7 @@ use core::time;
 use std::thread::sleep;
 
 use assertor::{assert_that, ResultAssertion};
-use temp_env_vars_macro::temp_env_vars;
+use temp_env_vars::temp_env_vars;
 
 #[test]
 #[temp_env_vars]