From b5ff4c06eb6b1729bb8bc0351008a51cad7ec871 Mon Sep 17 00:00:00 2001
From: Chris Johnston <chris@thejohnstons.net>
Date: Fri, 31 Aug 2018 06:09:13 -0700
Subject: [PATCH] Fix swapped parameters in ArgumentException and
 ArgumentNullException cstrs

The constructors of ArgumentException and ArgumentNullException are inconsistent with each other, which results in their parameters being swapped here and there.
---
 src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs | 2 +-
 src/Discord.Net.Core/Utils/Preconditions.cs            | 5 +----
 src/Discord.Net.Core/Utils/TokenUtils.cs               | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs b/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
index 7e288ef6b..ee06fb5c5 100644
--- a/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
+++ b/src/Discord.Net.Core/Entities/Messages/EmbedBuilder.cs
@@ -75,7 +75,7 @@ namespace Discord
             get => _fields;
             set
             {
-                if (value == null) throw new ArgumentNullException("Cannot set an embed builder's fields collection to null", nameof(Fields));
+                if (value == null) throw new ArgumentNullException(nameof(Fields), "Cannot set an embed builder's fields collection to null");
                 if (value.Count > MaxFieldCount) throw new ArgumentException($"Field count must be less than or equal to {MaxFieldCount}.", nameof(Fields));
                 _fields = value;
             }
diff --git a/src/Discord.Net.Core/Utils/Preconditions.cs b/src/Discord.Net.Core/Utils/Preconditions.cs
index 1a297a6a1..2ecb34a1a 100644
--- a/src/Discord.Net.Core/Utils/Preconditions.cs
+++ b/src/Discord.Net.Core/Utils/Preconditions.cs
@@ -45,10 +45,7 @@ namespace Discord
         }        
 
         private static ArgumentException CreateNotEmptyException(string name, string msg)
-        {
-            if (msg == null) return new ArgumentException("Argument cannot be blank", name);
-            else return new ArgumentException(name, msg);
-        }
+            => new ArgumentException(msg ?? "Argument cannot be blank.", name);
 
         //Numerics
         public static void NotEqual(sbyte obj, sbyte value, string name, string msg = null) { if (obj == value) throw CreateNotEqualException(name, msg, value); }
diff --git a/src/Discord.Net.Core/Utils/TokenUtils.cs b/src/Discord.Net.Core/Utils/TokenUtils.cs
index 2cc0f1041..73f8ebbde 100644
--- a/src/Discord.Net.Core/Utils/TokenUtils.cs
+++ b/src/Discord.Net.Core/Utils/TokenUtils.cs
@@ -19,7 +19,7 @@ namespace Discord
         {
             // A Null or WhiteSpace token of any type is invalid.
             if (string.IsNullOrWhiteSpace(token))
-                throw new ArgumentNullException("A token cannot be null, empty, or contain only whitespace.", nameof(token));
+                throw new ArgumentNullException(nameof(token), "A token cannot be null, empty, or contain only whitespace.");
 
             switch (tokenType)
             {