aboutsummaryrefslogtreecommitdiff
path: root/src/model/misc.rs
diff options
context:
space:
mode:
authorAustin Hellyer <[email protected]>2017-01-23 12:16:06 -0800
committerAustin Hellyer <[email protected]>2017-01-23 12:16:06 -0800
commit651c618f17cb92d3ea9bbd1d5f5c92a015ff64e0 (patch)
treedcf452e8fe73411af331678a769cb769a32dd12e /src/model/misc.rs
parentFix no-framework compilation (diff)
downloadserenity-651c618f17cb92d3ea9bbd1d5f5c92a015ff64e0.tar.xz
serenity-651c618f17cb92d3ea9bbd1d5f5c92a015ff64e0.zip
Switch to a mostly-fully OOP approach
The context is now strictly in relation to the context of the current channel related to the event, if any. See Context::say for a list of events that the context can be used for.
Diffstat (limited to 'src/model/misc.rs')
-rw-r--r--src/model/misc.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/model/misc.rs b/src/model/misc.rs
index f3632a5..eaae890 100644
--- a/src/model/misc.rs
+++ b/src/model/misc.rs
@@ -78,7 +78,7 @@ impl Mentionable for User {
}
}
-#[cfg(all(feature="cache", feature="methods"))]
+#[cfg(feature="cache")]
impl FromStr for User {
type Err = ();
@@ -103,7 +103,7 @@ impl FromStr for UserId {
}
}
-#[cfg(all(feature="cache", feature="methods"))]
+#[cfg(feature="cache")]
impl FromStr for Role {
type Err = ();
@@ -130,7 +130,6 @@ impl FromStr for RoleId {
impl EmojiIdentifier {
/// Generates a URL to the emoji's image.
- #[cfg(feature="methods")]
#[inline]
pub fn url(&self) -> String {
format!(cdn!("/emojis/{}.png"), self.id)
@@ -153,7 +152,7 @@ impl FromStr for ChannelId {
}
}
-#[cfg(all(feature="cache", feature="methods"))]
+#[cfg(feature="cache")]
impl FromStr for Channel {
type Err = ();