From a090b6c21c877e8835f25e1d70d667abf07d1d3c Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 16 May 2020 11:29:40 -0400
Subject: use newer C# features

---
 .../Controllers/JsonValidatorController.cs         | 32 ++++++++++------------
 src/SMAPI.Web/Controllers/ModsApiController.cs     |  4 +--
 2 files changed, 16 insertions(+), 20 deletions(-)

(limited to 'src/SMAPI.Web/Controllers')

diff --git a/src/SMAPI.Web/Controllers/JsonValidatorController.cs b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
index 2ade3e3d..c43fb929 100644
--- a/src/SMAPI.Web/Controllers/JsonValidatorController.cs
+++ b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
@@ -275,21 +275,20 @@ namespace StardewModdingAPI.Web.Controllers
                 errors = new Dictionary<string, string>(errors, StringComparer.InvariantCultureIgnoreCase);
 
                 // match error by type and message
-                foreach (var pair in errors)
+                foreach ((string target, string errorMessage) in errors)
                 {
-                    if (!pair.Key.Contains(":"))
+                    if (!target.Contains(":"))
                         continue;
 
-                    string[] parts = pair.Key.Split(':', 2);
+                    string[] parts = target.Split(':', 2);
                     if (parts[0].Equals(error.ErrorType.ToString(), StringComparison.InvariantCultureIgnoreCase) && Regex.IsMatch(error.Message, parts[1]))
-                        return pair.Value?.Trim();
+                        return errorMessage?.Trim();
                 }
 
                 // match by type
-                if (errors.TryGetValue(error.ErrorType.ToString(), out string message))
-                    return message?.Trim();
-
-                return null;
+                return errors.TryGetValue(error.ErrorType.ToString(), out string message)
+                    ? message?.Trim()
+                    : null;
             }
 
             return GetRawOverrideError()
@@ -304,10 +303,10 @@ namespace StardewModdingAPI.Web.Controllers
         {
             if (schema.ExtensionData != null)
             {
-                foreach (var pair in schema.ExtensionData)
+                foreach ((string curKey, JToken value) in schema.ExtensionData)
                 {
-                    if (pair.Key.Equals(key, StringComparison.InvariantCultureIgnoreCase))
-                        return pair.Value.ToObject<T>();
+                    if (curKey.Equals(key, StringComparison.InvariantCultureIgnoreCase))
+                        return value.ToObject<T>();
                 }
             }
 
@@ -318,14 +317,11 @@ namespace StardewModdingAPI.Web.Controllers
         /// <param name="value">The value to format.</param>
         private string FormatValue(object value)
         {
-            switch (value)
+            return value switch
             {
-                case List<string> list:
-                    return string.Join(", ", list);
-
-                default:
-                    return value?.ToString() ?? "null";
-            }
+                List<string> list => string.Join(", ", list),
+                _ => value?.ToString() ?? "null"
+            };
         }
     }
 }
diff --git a/src/SMAPI.Web/Controllers/ModsApiController.cs b/src/SMAPI.Web/Controllers/ModsApiController.cs
index 06768f03..e841a075 100644
--- a/src/SMAPI.Web/Controllers/ModsApiController.cs
+++ b/src/SMAPI.Web/Controllers/ModsApiController.cs
@@ -388,9 +388,9 @@ namespace StardewModdingAPI.Web.Controllers
                 if (map.ContainsKey(parsed.ToString()))
                     return map[parsed.ToString()];
 
-                foreach (var pair in map)
+                foreach ((string fromRaw, string toRaw) in map)
                 {
-                    if (SemanticVersion.TryParse(pair.Key, allowNonStandard, out ISemanticVersion target) && parsed.Equals(target) && SemanticVersion.TryParse(pair.Value, allowNonStandard, out ISemanticVersion newVersion))
+                    if (SemanticVersion.TryParse(fromRaw, allowNonStandard, out ISemanticVersion target) && parsed.Equals(target) && SemanticVersion.TryParse(toRaw, allowNonStandard, out ISemanticVersion newVersion))
                         return newVersion.ToString();
                 }
             }
-- 
cgit