From 8aa1050b9333fb8dbc68619d30f6331986446d84 Mon Sep 17 00:00:00 2001 From: RogueException Date: Tue, 4 Oct 2016 09:01:57 -0300 Subject: [PATCH] Cleaned up usings --- src/Discord.Net.Commands/Results/TypeReaderResult.cs | 1 - src/Discord.Net.Core/Entities/Guilds/IGuild.cs | 6 +++--- src/Discord.Net.Core/Entities/Roles/Color.cs | 2 +- src/Discord.Net.Core/Entities/Users/IGroupUser.cs | 4 +--- src/Discord.Net.Core/Entities/Users/IGuildUser.cs | 4 ++-- .../Net/Converters/DiscordContractResolver.cs | 1 - .../Net/Queue/Requests/MultipartRestRequest.cs | 1 - src/Discord.Net.Core/Utils/MentionsHelper.cs | 1 - src/Discord.Net.Rest/BaseDiscordClient.cs | 6 +++--- .../Entities/Channels/ChannelHelper.cs | 6 +++--- src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs | 10 +++++----- src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs | 10 +++++----- .../Entities/Messages/RestUserMessage.cs | 5 ++--- src/Discord.Net.Rest/Entities/Users/RestUser.cs | 3 +-- src/Discord.Net.Rest/Entities/Users/UserHelper.cs | 6 +++--- src/Discord.Net.Rest/Properties/AssemblyInfo.cs | 1 - src/Discord.Net.Rpc/API/Rpc/AuthorizeResponse.cs | 1 - src/Discord.Net.Rpc/Entities/Guilds/RpcGuild.cs | 6 +----- src/Discord.Net.Rpc/Properties/AssemblyInfo.cs | 1 - src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs | 4 ++-- .../API/Gateway/VoiceServerUpdateEvent.cs | 2 +- .../Entities/Channels/SocketDMChannel.cs | 1 - .../Entities/Channels/SocketTextChannel.cs | 1 - .../Entities/Users/SocketGlobalUser.cs | 1 - src/Discord.Net.WebSocket/Properties/AssemblyInfo.cs | 1 - src/Discord.Net/Properties/AssemblyInfo.cs | 1 - 26 files changed, 33 insertions(+), 53 deletions(-) diff --git a/src/Discord.Net.Commands/Results/TypeReaderResult.cs b/src/Discord.Net.Commands/Results/TypeReaderResult.cs index 20a9c4a2..68bc359c 100644 --- a/src/Discord.Net.Commands/Results/TypeReaderResult.cs +++ b/src/Discord.Net.Commands/Results/TypeReaderResult.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; -using System.Linq; namespace Discord.Commands { diff --git a/src/Discord.Net.Core/Entities/Guilds/IGuild.cs b/src/Discord.Net.Core/Entities/Guilds/IGuild.cs index 414a7cc7..f1b1da6a 100644 --- a/src/Discord.Net.Core/Entities/Guilds/IGuild.cs +++ b/src/Discord.Net.Core/Entities/Guilds/IGuild.cs @@ -1,8 +1,8 @@ -using System; +using Discord.API.Rest; +using Discord.Audio; +using System; using System.Collections.Generic; using System.Threading.Tasks; -using Discord.API.Rest; -using Discord.Audio; namespace Discord { diff --git a/src/Discord.Net.Core/Entities/Roles/Color.cs b/src/Discord.Net.Core/Entities/Roles/Color.cs index 0eb562e8..56391795 100644 --- a/src/Discord.Net.Core/Entities/Roles/Color.cs +++ b/src/Discord.Net.Core/Entities/Roles/Color.cs @@ -1,7 +1,7 @@ using System; using System.Diagnostics; -namespace Discord +namespace Discord { [DebuggerDisplay(@"{DebuggerDisplay,nq}")] public struct Color diff --git a/src/Discord.Net.Core/Entities/Users/IGroupUser.cs b/src/Discord.Net.Core/Entities/Users/IGroupUser.cs index 8b4c3bf7..3d18b7cd 100644 --- a/src/Discord.Net.Core/Entities/Users/IGroupUser.cs +++ b/src/Discord.Net.Core/Entities/Users/IGroupUser.cs @@ -1,6 +1,4 @@ -using System.Threading.Tasks; - -namespace Discord +namespace Discord { public interface IGroupUser : IUser, IVoiceState { diff --git a/src/Discord.Net.Core/Entities/Users/IGuildUser.cs b/src/Discord.Net.Core/Entities/Users/IGuildUser.cs index b109e2f3..768951c7 100644 --- a/src/Discord.Net.Core/Entities/Users/IGuildUser.cs +++ b/src/Discord.Net.Core/Entities/Users/IGuildUser.cs @@ -1,7 +1,7 @@ -using System; +using Discord.API.Rest; +using System; using System.Collections.Generic; using System.Threading.Tasks; -using Discord.API.Rest; namespace Discord { diff --git a/src/Discord.Net.Core/Net/Converters/DiscordContractResolver.cs b/src/Discord.Net.Core/Net/Converters/DiscordContractResolver.cs index c387db0b..413fd512 100644 --- a/src/Discord.Net.Core/Net/Converters/DiscordContractResolver.cs +++ b/src/Discord.Net.Core/Net/Converters/DiscordContractResolver.cs @@ -3,7 +3,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Serialization; using System; using System.Collections.Generic; -using System.IO; using System.Linq; using System.Reflection; diff --git a/src/Discord.Net.Core/Net/Queue/Requests/MultipartRestRequest.cs b/src/Discord.Net.Core/Net/Queue/Requests/MultipartRestRequest.cs index f30969e4..047e5ed0 100644 --- a/src/Discord.Net.Core/Net/Queue/Requests/MultipartRestRequest.cs +++ b/src/Discord.Net.Core/Net/Queue/Requests/MultipartRestRequest.cs @@ -1,5 +1,4 @@ using Discord.Net.Rest; -using System; using System.Collections.Generic; using System.IO; using System.Threading.Tasks; diff --git a/src/Discord.Net.Core/Utils/MentionsHelper.cs b/src/Discord.Net.Core/Utils/MentionsHelper.cs index 19c0fd51..3c281259 100644 --- a/src/Discord.Net.Core/Utils/MentionsHelper.cs +++ b/src/Discord.Net.Core/Utils/MentionsHelper.cs @@ -3,7 +3,6 @@ using System.Collections.Immutable; using System.Globalization; using System.Linq; using System.Text.RegularExpressions; -using System.Threading.Tasks; namespace Discord { diff --git a/src/Discord.Net.Rest/BaseDiscordClient.cs b/src/Discord.Net.Rest/BaseDiscordClient.cs index b6ea634d..98d25cba 100644 --- a/src/Discord.Net.Rest/BaseDiscordClient.cs +++ b/src/Discord.Net.Rest/BaseDiscordClient.cs @@ -1,10 +1,10 @@ -using System; +using Discord.Logging; +using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.IO; using System.Threading; using System.Threading.Tasks; -using Discord.Logging; -using System.Collections.Immutable; namespace Discord.Rest { diff --git a/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs b/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs index af8ab3fc..0022c79d 100644 --- a/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs +++ b/src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs @@ -1,10 +1,10 @@ using Discord.API.Rest; -using System.IO; -using System.Threading.Tasks; using System; using System.Collections.Generic; -using System.Linq; using System.Collections.Immutable; +using System.IO; +using System.Linq; +using System.Threading.Tasks; using Model = Discord.API.Channel; namespace Discord.Rest diff --git a/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs b/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs index a00f6243..d3fdf01d 100644 --- a/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs +++ b/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs @@ -1,12 +1,12 @@ using Discord.API.Rest; using System; using System.Collections.Generic; -using System.Threading.Tasks; -using Model = Discord.API.Guild; -using EmbedModel = Discord.API.GuildEmbed; -using RoleModel = Discord.API.Role; -using System.Linq; using System.Collections.Immutable; +using System.Linq; +using System.Threading.Tasks; +using EmbedModel = Discord.API.GuildEmbed; +using Model = Discord.API.Guild; +using RoleModel = Discord.API.Role; namespace Discord.Rest { diff --git a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs index ae61187a..19af50ec 100644 --- a/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs +++ b/src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs @@ -1,12 +1,12 @@ -using System.Diagnostics; -using System.Collections.Immutable; +using Discord.API.Rest; using Discord.Audio; using System; using System.Collections.Generic; -using System.Threading.Tasks; -using Discord.API.Rest; -using Model = Discord.API.Guild; +using System.Collections.Immutable; +using System.Diagnostics; using System.Linq; +using System.Threading.Tasks; +using Model = Discord.API.Guild; namespace Discord.Rest { diff --git a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs index 824de3c7..a588126e 100644 --- a/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs +++ b/src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs @@ -1,11 +1,10 @@ using Discord.API.Rest; using System; +using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; using System.Threading.Tasks; using Model = Discord.API.Message; -using Discord.API; -using System.Collections.Generic; -using System.Collections.Immutable; namespace Discord.Rest { diff --git a/src/Discord.Net.Rest/Entities/Users/RestUser.cs b/src/Discord.Net.Rest/Entities/Users/RestUser.cs index 5d704e59..b4d957f3 100644 --- a/src/Discord.Net.Rest/Entities/Users/RestUser.cs +++ b/src/Discord.Net.Rest/Entities/Users/RestUser.cs @@ -1,5 +1,4 @@ -using System; -using System.Diagnostics; +using System.Diagnostics; using System.Threading.Tasks; using Model = Discord.API.User; diff --git a/src/Discord.Net.Rest/Entities/Users/UserHelper.cs b/src/Discord.Net.Rest/Entities/Users/UserHelper.cs index 01262728..a7ee241f 100644 --- a/src/Discord.Net.Rest/Entities/Users/UserHelper.cs +++ b/src/Discord.Net.Rest/Entities/Users/UserHelper.cs @@ -1,8 +1,8 @@ using Discord.API.Rest; -using System.Threading.Tasks; -using Model = Discord.API.User; -using MemberModel = Discord.API.GuildMember; using System; +using System.Threading.Tasks; +using MemberModel = Discord.API.GuildMember; +using Model = Discord.API.User; namespace Discord.Rest { diff --git a/src/Discord.Net.Rest/Properties/AssemblyInfo.cs b/src/Discord.Net.Rest/Properties/AssemblyInfo.cs index f6a5354d..bfca3dfe 100644 --- a/src/Discord.Net.Rest/Properties/AssemblyInfo.cs +++ b/src/Discord.Net.Rest/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Discord.Net.Rpc/API/Rpc/AuthorizeResponse.cs b/src/Discord.Net.Rpc/API/Rpc/AuthorizeResponse.cs index 1b674e95..a4f42b6f 100644 --- a/src/Discord.Net.Rpc/API/Rpc/AuthorizeResponse.cs +++ b/src/Discord.Net.Rpc/API/Rpc/AuthorizeResponse.cs @@ -1,6 +1,5 @@ #pragma warning disable CS1591 using Newtonsoft.Json; -using System; namespace Discord.API.Rpc { diff --git a/src/Discord.Net.Rpc/Entities/Guilds/RpcGuild.cs b/src/Discord.Net.Rpc/Entities/Guilds/RpcGuild.cs index 4fbde60a..3c0216dc 100644 --- a/src/Discord.Net.Rpc/Entities/Guilds/RpcGuild.cs +++ b/src/Discord.Net.Rpc/Entities/Guilds/RpcGuild.cs @@ -1,8 +1,4 @@ -using Discord.Rest; -using System; -using Model = Discord.API.Rpc.RpcUserGuild; - -namespace Discord.Rpc +namespace Discord.Rpc { /*internal class RemoteUserGuild : RpcEntity, IRemoteUserGuild, ISnowflakeEntity { diff --git a/src/Discord.Net.Rpc/Properties/AssemblyInfo.cs b/src/Discord.Net.Rpc/Properties/AssemblyInfo.cs index 9cfcc4aa..7edd100f 100644 --- a/src/Discord.Net.Rpc/Properties/AssemblyInfo.cs +++ b/src/Discord.Net.Rpc/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs b/src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs index 8b9209c6..62608b7e 100644 --- a/src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs +++ b/src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs @@ -9,11 +9,11 @@ using System.Diagnostics; using System.Globalization; using System.IO; using System.IO.Compression; +using System.Net; +using System.Net.Sockets; using System.Text; using System.Threading; using System.Threading.Tasks; -using System.Net.Sockets; -using System.Net; namespace Discord.Audio { diff --git a/src/Discord.Net.WebSocket/API/Gateway/VoiceServerUpdateEvent.cs b/src/Discord.Net.WebSocket/API/Gateway/VoiceServerUpdateEvent.cs index bc65ea6e..a300f0d2 100644 --- a/src/Discord.Net.WebSocket/API/Gateway/VoiceServerUpdateEvent.cs +++ b/src/Discord.Net.WebSocket/API/Gateway/VoiceServerUpdateEvent.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; namespace Discord.API.Gateway { - public class VoiceServerUpdateEvent + public class VoiceServerUpdateEvent { [JsonProperty("guild_id")] public ulong GuildId { get; set; } diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs index 0a747b44..314a0a3c 100644 --- a/src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs +++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs @@ -6,7 +6,6 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Threading.Tasks; -using MessageModel = Discord.API.Message; using Model = Discord.API.Channel; namespace Discord.WebSocket diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs index c1f5ca82..6e7aeafd 100644 --- a/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs +++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs @@ -7,7 +7,6 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Threading.Tasks; -using MessageModel = Discord.API.Message; using Model = Discord.API.Channel; namespace Discord.WebSocket diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs index d9699388..f54fcaa7 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketGlobalUser.cs @@ -1,5 +1,4 @@ using Model = Discord.API.User; -using System.Collections.Concurrent; namespace Discord.WebSocket { diff --git a/src/Discord.Net.WebSocket/Properties/AssemblyInfo.cs b/src/Discord.Net.WebSocket/Properties/AssemblyInfo.cs index 2aae053d..86c8fc44 100644 --- a/src/Discord.Net.WebSocket/Properties/AssemblyInfo.cs +++ b/src/Discord.Net.WebSocket/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/src/Discord.Net/Properties/AssemblyInfo.cs b/src/Discord.Net/Properties/AssemblyInfo.cs index e23324a5..1dab21bf 100644 --- a/src/Discord.Net/Properties/AssemblyInfo.cs +++ b/src/Discord.Net/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following