diff options
| author | Zeyla Hellyer <[email protected]> | 2017-11-01 11:12:10 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-11-01 11:12:10 -0700 |
| commit | 1d632f72824e7c4d070169ae0b450f1d3594f434 (patch) | |
| tree | 682691cfba6e53697cd66303ad580937cffdd613 /src | |
| parent | Use consistent token names in examples (diff) | |
| download | serenity-1d632f72824e7c4d070169ae0b450f1d3594f434.tar.xz serenity-1d632f72824e7c4d070169ae0b450f1d3594f434.zip | |
Fix no-parking_lot compilation
Fixes compilation without the `parking_lot` crate compiled. The prelude
re-exposed `parking_lot`'s `Mutex` and `RwLock`, but didn't do so
conditionally.
Diffstat (limited to 'src')
| -rw-r--r-- | src/prelude.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/prelude.rs b/src/prelude.rs index 435fb8a..8a361e9 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -16,7 +16,6 @@ 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}; @@ -26,5 +25,7 @@ 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; |