From 37ee7883398ffb2b4e4e9e1652468f9afbb7b57b Mon Sep 17 00:00:00 2001 From: Austin Hellyer Date: Sat, 5 Nov 2016 23:10:44 -0700 Subject: Add a prelude for userland Users can now import all of a prelude via `use serenity::prelude::*;`, which should provide some helpful stuff. As such, the internal prelude is now named `serenity::prelude_internal`, and all internal uses have been adjusted. --- src/client/connection.rs | 2 +- src/client/context.rs | 2 +- src/client/dispatch.rs | 2 +- src/client/http.rs | 2 +- src/client/mod.rs | 2 +- src/client/ratelimiting.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/client') diff --git a/src/client/connection.rs b/src/client/connection.rs index ef7d949..2b70518 100644 --- a/src/client/connection.rs +++ b/src/client/connection.rs @@ -23,7 +23,7 @@ use websocket::ws::receiver::Receiver as WsReceiver; use websocket::ws::sender::Sender as WsSender; use ::constants::{self, OpCode}; use ::model::*; -use ::prelude::*; +use ::prelude_internal::*; enum Status { SendMessage(Value), diff --git a/src/client/context.rs b/src/client/context.rs index d8700e2..2fb0d22 100644 --- a/src/client/context.rs +++ b/src/client/context.rs @@ -15,7 +15,7 @@ use ::builder::{ GetMessages }; use ::model::*; -use ::prelude::*; +use ::prelude_internal::*; use ::utils; #[derive(Clone)] diff --git a/src/client/dispatch.rs b/src/client/dispatch.rs index 567bc6e..9a7fc2d 100644 --- a/src/client/dispatch.rs +++ b/src/client/dispatch.rs @@ -5,7 +5,7 @@ use super::login_type::LoginType; use super::{STATE, Connection, Context}; use ::ext::framework::Framework; use ::model::{ChannelId, Event, Message}; -use ::prelude::*; +use ::prelude_internal::*; macro_rules! handler { ($field:ident, $event_store:ident) => { diff --git a/src/client/http.rs b/src/client/http.rs index d55420c..fca8865 100644 --- a/src/client/http.rs +++ b/src/client/http.rs @@ -35,7 +35,7 @@ use std::sync::{Arc, Mutex}; use super::ratelimiting::{self, Route}; use ::constants; use ::model::*; -use ::prelude::*; +use ::prelude_internal::*; use ::utils::decode_array; lazy_static! { diff --git a/src/client/mod.rs b/src/client/mod.rs index 494a86e..7870e2e 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -55,7 +55,7 @@ use std::sync::{Arc, Mutex}; use std::thread; use std::time::Duration; use ::model::*; -use ::prelude::*; +use ::prelude_internal::*; use ::ext::framework::Framework; use ::ext::state::State; diff --git a/src/client/ratelimiting.rs b/src/client/ratelimiting.rs index 84d75b5..5690dbe 100644 --- a/src/client/ratelimiting.rs +++ b/src/client/ratelimiting.rs @@ -8,7 +8,7 @@ use std::thread; use std::time::Duration; use super::http; use time; -use ::prelude::*; +use ::prelude_internal::*; lazy_static! { static ref GLOBAL: Arc> = Arc::new(Mutex::new(RateLimit::default())); -- cgit v1.2.3