aboutsummaryrefslogtreecommitdiff
path: root/src/internal
diff options
context:
space:
mode:
authorLakelezz <[email protected]>2018-12-07 23:12:34 +0100
committerAlex M. M <[email protected]>2018-12-07 23:12:34 +0100
commitc36bd39dda9c548b5a83b6f0df20ccdff9cd0fb8 (patch)
treeba43473c21c6129c2f3f85c24193374e99c2f157 /src/internal
parentChange all builders to mutably borrow (#443) (diff)
downloadserenity-c36bd39dda9c548b5a83b6f0df20ccdff9cd0fb8.tar.xz
serenity-c36bd39dda9c548b5a83b6f0df20ccdff9cd0fb8.zip
Update to Rust 2018 (#445)
Diffstat (limited to 'src/internal')
-rw-r--r--src/internal/prelude.rs4
-rw-r--r--src/internal/timer.rs2
-rw-r--r--src/internal/ws_impl.rs4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/internal/prelude.rs b/src/internal/prelude.rs
index e248206..63ea36d 100644
--- a/src/internal/prelude.rs
+++ b/src/internal/prelude.rs
@@ -6,9 +6,9 @@
pub type JsonMap = Map<String, Value>;
-pub use error::{Error, Result};
+pub use crate::error::{Error, Result};
pub use serde_json::{Map, Number, Value};
pub use std::result::Result as StdResult;
#[cfg(feature = "client")]
-pub use client::ClientError;
+pub use crate::client::ClientError;
diff --git a/src/internal/timer.rs b/src/internal/timer.rs
index 82cec0d..d126b08 100644
--- a/src/internal/timer.rs
+++ b/src/internal/timer.rs
@@ -20,7 +20,7 @@ impl Timer {
}
}
- pub fn await(&mut self) {
+ pub fn r#await(&mut self) {
let due_time = (self.due.timestamp() * 1000) + i64::from(self.due.timestamp_subsec_millis());
let now_time = {
let now = Utc::now();
diff --git a/src/internal/ws_impl.rs b/src/internal/ws_impl.rs
index c8c74bb..5539f90 100644
--- a/src/internal/ws_impl.rs
+++ b/src/internal/ws_impl.rs
@@ -1,6 +1,6 @@
use flate2::read::ZlibDecoder;
-use gateway::WsClient;
-use internal::prelude::*;
+use crate::gateway::WsClient;
+use crate::internal::prelude::*;
use serde_json;
use tungstenite::Message;