Skip to content

Commit

Permalink
Remove useless method wrappers (#2795)
Browse files Browse the repository at this point in the history
  • Loading branch information
GnomedDev committed Mar 13, 2024
1 parent 0c53087 commit 1890018
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 22 deletions.
12 changes: 0 additions & 12 deletions src/cache/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -447,20 +447,12 @@ impl Cache {
/// [`members`]: crate::model::guild::Guild::members
#[deprecated = "Use Cache::guild and Guild::members instead"]
pub fn member(&self, guild_id: GuildId, user_id: UserId) -> Option<MemberRef<'_>> {
self._member(guild_id, user_id)
}

fn _member(&self, guild_id: GuildId, user_id: UserId) -> Option<MemberRef<'_>> {
let member = self.guilds.get(&guild_id)?.try_map(|g| g.members.get(&user_id)).ok()?;
Some(CacheRef::from_mapped_ref(member))
}

#[deprecated = "Use Cache::guild and Guild::roles instead"]
pub fn guild_roles(&self, guild_id: GuildId) -> Option<GuildRolesRef<'_>> {
self._guild_roles(guild_id)
}

fn _guild_roles(&self, guild_id: GuildId) -> Option<GuildRolesRef<'_>> {
let roles = self.guilds.get(&guild_id)?.map(|g| &g.roles);
Some(CacheRef::from_mapped_ref(roles))
}
Expand All @@ -473,10 +465,6 @@ impl Cache {
/// This method returns all channels from a guild of with the given `guild_id`.
#[deprecated = "Use Cache::guild and Guild::channels instead"]
pub fn guild_channels(&self, guild_id: GuildId) -> Option<GuildChannelsRef<'_>> {
self._guild_channels(guild_id)
}

fn _guild_channels(&self, guild_id: GuildId) -> Option<GuildChannelsRef<'_>> {
let channels = self.guilds.get(&guild_id)?.map(|g| &g.channels);
Some(CacheRef::from_mapped_ref(channels))
}
Expand Down
10 changes: 0 additions & 10 deletions src/model/guild/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1262,16 +1262,6 @@ impl Guild {
cache: &Cache,
lhs_id: UserId,
rhs_id: UserId,
) -> Option<UserId> {
self._greater_member_hierarchy(cache, lhs_id, rhs_id)
}

#[cfg(feature = "cache")]
fn _greater_member_hierarchy(
&self,
cache: &Cache,
lhs_id: UserId,
rhs_id: UserId,
) -> Option<UserId> {
// Check that the IDs are the same. If they are, neither is greater.
if lhs_id == rhs_id {
Expand Down

0 comments on commit 1890018

Please sign in to comment.