Fix parking_lot::{Mutex, RwLock} re-exports

Fix the re-exports for `parking_lot::{Mutex, RwLock}` no longer
functioning due to the conditional compilation gate removal
(`parking_lot` is now always compiled).

Tests have been updated to ensure the functionality of these re-exports.

2 files changed, 6 insertions, 4 deletions

diff --git a/src/prelude.rs b/src/prelude.rs
index 8a361e9..435fb8a 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -16,6 +16,7 @@
 
 pub use error::Error as SerenityError;
 pub use model::Mentionable;
+pub use parking_lot::{Mutex, RwLock};
 
 #[cfg(feature = "client")]
 pub use client::{Client, ClientError as ClientError, Context, EventHandler};
@@ -25,7 +26,5 @@ pub use gateway::GatewayError;
 pub use http::HttpError;
 #[cfg(feature = "model")]
 pub use model::ModelError;
-#[cfg(feature = "parking_lot")]
-pub use parking_lot::{Mutex, RwLock};
 #[cfg(feature = "voice")]
 pub use voice::VoiceError;
diff --git a/tests/test_prelude.rs b/tests/test_prelude.rs
index 2317fc0..7233b2a 100644
--- a/tests/test_prelude.rs
+++ b/tests/test_prelude.rs
@@ -1,8 +1,11 @@
+#![allow(unused_imports)]
+
 extern crate serenity;
 
-#[allow(unused_imports)]
 use serenity::prelude::{Mentionable, SerenityError};
 
-#[allow(unused_imports)]
 #[cfg(feature = "client")]
 use serenity::prelude::{Client, ClientError};
+
+// parking_lot re-exports
+use serenity::prelude::{Mutex, RwLock};