Visual Studio C#7 suggestions

This commit is contained in:
Christopher F
2017-04-23 15:23:06 -04:00
parent 6000b15c4d
commit 431b7fbd9f
21 changed files with 80 additions and 165 deletions

View File

@@ -60,8 +60,7 @@ namespace Discord.Rest
public RestUser GetUser(ulong id)
{
RestGroupUser user;
if (_users.TryGetValue(id, out user))
if (_users.TryGetValue(id, out RestGroupUser user))
return user;
return null;
}

View File

@@ -213,8 +213,7 @@ namespace Discord.Rest
//Roles
public RestRole GetRole(ulong id)
{
RestRole value;
if (_roles.TryGetValue(id, out value))
if (_roles.TryGetValue(id, out RestRole value))
return value;
return null;
}

View File

@@ -58,8 +58,7 @@ namespace Discord.Rest
{
if (Guild != null)
return Guild;
var guildChannel = Channel as IGuildChannel;
if (guildChannel != null)
if (Channel is IGuildChannel guildChannel)
return guildChannel.Guild; //If it fails, it'll still return this exception
throw new InvalidOperationException("Unable to return this entity's parent unless it was fetched through that object.");
}

View File

@@ -80,8 +80,7 @@ namespace Discord.Rest
if (endIndex == -1) break;
string content = text.Substring(index, endIndex - index + 1);
ulong id;
if (MentionUtils.TryParseUser(content, out id))
if (MentionUtils.TryParseUser(content, out ulong id))
{
IUser mentionedUser = null;
foreach (var mention in userMentions)