Rename `Guild::permissions_for`->`permissions_in`

Rename `Guild::permissions_for` to `Guild::permissions_in`, deprecating
`Guild::permissions_for` which is only an inline method to
`permissions_in`.

4 files changed, 18 insertions, 7 deletions

diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
index d6649b4..b7295fc 100644
--- a/src/model/channel/guild_channel.rs
+++ b/src/model/channel/guild_channel.rs
@@ -512,7 +512,7 @@ impl GuildChannel {
     pub fn permissions_for<U: Into<UserId>>(&self, user_id: U) -> Result<Permissions> {
         self.guild()
             .ok_or_else(|| Error::Model(ModelError::GuildNotFound))
-            .map(|g| g.read().unwrap().permissions_for(self.id, user_id))
+            .map(|g| g.read().unwrap().permissions_in(self.id, user_id))
     }
 
     /// Pins a [`Message`] to the channel.
diff --git a/src/model/guild/member.rs b/src/model/guild/member.rs
index 6e04b98..a9de969 100644
--- a/src/model/guild/member.rs
+++ b/src/model/guild/member.rs
@@ -257,7 +257,7 @@ impl Member {
                 .get(&self.guild_id)
                 .map(|guild| guild.read().unwrap().has_perms(req));
 
-            if let Some(Ok(false)) = has_perms {
+            if let Some(false) = has_perms {
                 return Err(Error::Model(ModelError::InvalidPermissions(req)));
             }
         }
@@ -301,7 +301,7 @@ impl Member {
 
         Ok(
             guild
-                .permissions_for(default_channel.id, self.user.read().unwrap().id),
+                .permissions_in(default_channel.id, self.user.read().unwrap().id),
         )
     }
 
diff --git a/src/model/guild/mod.rs b/src/model/guild/mod.rs
index 1ad2b36..fe9bc6a 100644
--- a/src/model/guild/mod.rs
+++ b/src/model/guild/mod.rs
@@ -132,7 +132,7 @@ impl Guild {
         let uid = CACHE.read().unwrap().user.id;
 
         for (cid, channel) in &self.channels {
-            if self.permissions_for(*cid, uid).read_messages() {
+            if self.permissions_in(*cid, uid).read_messages() {
                 return Some(channel.read().unwrap().clone());
             }
         }
@@ -148,7 +148,7 @@ impl Guild {
     pub fn default_channel_guaranteed(&self) -> Option<GuildChannel> {
         for (cid, channel) in &self.channels {
             for memid in self.members.keys() {
-                if self.permissions_for(*cid, *memid).read_messages() {
+                if self.permissions_in(*cid, *memid).read_messages() {
                     return Some(channel.read().unwrap().clone());
                 }
             }
@@ -1058,10 +1058,21 @@ impl Guild {
         self.id.move_member(user_id, channel_id)
     }
 
+    /// Alias for [`permissions_in`].
+    ///
+    /// [`permissions_in`]: #method.permissions_in
+    #[deprecated(since = "0.4.3",
+                 note = "This will serve a different purpose in 0.5")]
+    #[inline]
+    pub fn permissions_for<C, U>(&self, channel_id: C, user_id: U)
+        -> Permissions where C: Into<ChannelId>, U: Into<UserId> {
+        self.permissions_in(channel_id, user_id)
+    }
+
     /// Calculate a [`User`]'s permissions in a given channel in the guild.
     ///
     /// [`User`]: struct.User.html
-    pub fn permissions_for<C, U>(&self, channel_id: C, user_id: U) -> Permissions
+    pub fn permissions_in<C, U>(&self, channel_id: C, user_id: U) -> Permissions
         where C: Into<ChannelId>, U: Into<UserId> {
         let user_id = user_id.into();
 
diff --git a/src/model/utils.rs b/src/model/utils.rs
index 719a472..a64156b 100644
--- a/src/model/utils.rs
+++ b/src/model/utils.rs
@@ -180,7 +180,7 @@ pub fn user_has_perms(channel_id: ChannelId, mut permissions: Permissions) -> Re
     let perms = guild
         .read()
         .unwrap()
-        .permissions_for(channel_id, current_user.id);
+        .permissions_in(channel_id, current_user.id);
 
     permissions.remove(perms);