diff options
| author | alex <[email protected]> | 2017-06-14 18:26:01 +0200 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-06-14 09:26:01 -0700 |
| commit | 32e07e4ac822d5cc1118f0db0fc92b549c1aaf81 (patch) | |
| tree | a4db15956faac92d544135de6885d64854a8b31d /src/model | |
| parent | Use HTTPS Connector with remaining HTTP functions (diff) | |
| download | serenity-32e07e4ac822d5cc1118f0db0fc92b549c1aaf81.tar.xz serenity-32e07e4ac822d5cc1118f0db0fc92b549c1aaf81.zip | |
Switch from #[doc(hidden)] to pub(crate)
Switch from using `#[doc(hidden)]` to hide some internal functions to
`pub(crate)`.
The library now requires rustc 1.18.
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/channel/message.rs | 9 | ||||
| -rw-r--r-- | src/model/event.rs | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/model/channel/message.rs b/src/model/channel/message.rs index 930c046..15200fe 100644 --- a/src/model/channel/message.rs +++ b/src/model/channel/message.rs @@ -232,8 +232,7 @@ impl Message { } } - #[doc(hidden)] - pub fn transform_content(&mut self) { + pub(crate) fn transform_content(&mut self) { match self.kind { MessageType::PinsAdd => { self.content = format!("{} pinned a message to this channel. See all the pins.", self.author); @@ -497,8 +496,7 @@ impl Message { self.reaction_users(reaction_type, limit, after) } - #[doc(hidden)] - pub fn check_content_length(map: &JsonMap) -> Result<()> { + pub(crate) fn check_content_length(map: &JsonMap) -> Result<()> { if let Some(content) = map.get("content") { if let Value::String(ref content) = *content { if let Some(length_over) = Message::overflow_length(content) { @@ -510,8 +508,7 @@ impl Message { Ok(()) } - #[doc(hidden)] - pub fn check_embed_length(map: &JsonMap) -> Result<()> { + pub(crate) fn check_embed_length(map: &JsonMap) -> Result<()> { let embed = match map.get("embed") { Some(&Value::Object(ref value)) => value, _ => return Ok(()), diff --git a/src/model/event.rs b/src/model/event.rs index bbb60c7..86825fa 100644 --- a/src/model/event.rs +++ b/src/model/event.rs @@ -2,7 +2,9 @@ use chrono::{DateTime, FixedOffset}; use serde::de::Error as DeError; -use serde_json::{self, Error as JsonError}; +use serde_json; +#[cfg(feature="voice")] +use serde_json::Error as JsonError; use std::collections::HashMap; use super::utils::deserialize_emojis; use super::*; @@ -737,8 +739,8 @@ pub enum VoiceEvent { } impl VoiceEvent { - #[doc(hidden)] - pub fn decode(value: Value) -> Result<VoiceEvent> { + #[cfg(feature="voice")] + pub(crate) fn decode(value: Value) -> Result<VoiceEvent> { let mut map = JsonMap::deserialize(value)?; let op = match map.remove("op") { |