cleanup

Author: mythz

src/ServiceStack.Text/AssemblyUtils.cs

@@ -26,8 +26,7 @@ public static class AssemblyUtils
         /// <returns></returns>
         public static Type FindType(string typeName)
         {
-            Type type = null;
-            if (TypeCache.TryGetValue(typeName, out type)) return type;
+            if (TypeCache.TryGetValue(typeName, out var type)) return type;
 
             type = Type.GetType(typeName);
             if (type == null)
@@ -62,7 +61,7 @@ public static Type MainInterface<T>()
                 var interfaceType = t.GetInterfaces().FirstOrDefault(i => !t.GetInterfaces().Any(i2 => i2.GetInterfaces().Contains(i)));
                 if (interfaceType != null) return interfaceType;
             }
-            return t; // not safe to use interface, as it might be a superclass's one.
+            return t; // not safe to use interface, as it might be a superclass one.
         }
 
         /// <summary>

src/ServiceStack.Text/AutoMappingUtils.cs

@@ -374,7 +374,7 @@ public static object PopulateWith(object obj)
         private static object PopulateObjectInternal(object obj, Dictionary<Type, int> recursionInfo)
         {
             if (obj == null) return null;
-            if (obj is string) return obj; // prevents it from dropping into the char[] Chars property.  Sheesh
+            if (obj is string) return obj; // prevents it from dropping into the char[] Chars property.
             var type = obj.GetType();
 
             var members = type.GetPublicMembers();

src/ServiceStack.Text/DateTimeExtensions.cs

@@ -17,7 +17,7 @@
 namespace ServiceStack.Text
 {
     /// <summary>
-    /// A fast, standards-based, serialization-issue free DateTime serailizer.
+    /// A fast, standards-based, serialization-issue free DateTime serializer.
     /// </summary>
     public static class DateTimeExtensions
     {

src/ServiceStack.Text/JsonObject.cs

@@ -78,8 +78,8 @@ public class JsonObject : Dictionary<string, string>
         /// </summary>
         public new string this[string key]
         {
-            get { return this.Get(key); }
-            set { base[key] = value; }
+            get => this.Get(key);
+            set => base[key] = value;
         }
 
         public static JsonObject Parse(string json)

src/ServiceStack.Text/QueryStringSerializer.cs

@@ -45,8 +45,7 @@ internal static WriteObjectDelegate GetWriteFn(Type type)
         {
             try
             {
-                WriteObjectDelegate writeFn;
-                if (WriteFnCache.TryGetValue(type, out writeFn)) return writeFn;
+                if (WriteFnCache.TryGetValue(type, out var writeFn)) return writeFn;
 
                 var genericType = typeof(QueryStringWriter<>).MakeGenericType(type);
                 var mi = genericType.GetStaticMethod("WriteFn");

src/ServiceStack.Text/RecyclableMemoryStream.cs

@@ -689,7 +689,7 @@ public MemoryStream GetStream(string tag, byte[] buffer, int offset, int count)
     /// buffers.
     /// </summary>
     /// <remarks>
-    /// This class works in tandem with the RecylableMemoryStreamManager to supply MemoryStream
+    /// This class works in tandem with the RecyclableMemoryStreamManager to supply MemoryStream
     /// objects to callers, while avoiding these specific problems:
     /// 1. LOH allocations - since all large buffers are pooled, they will never incur a Gen2 GC
     /// 2. Memory waste - A standard memory stream doubles its size when it runs out of room. This

src/ServiceStack.Text/ReflectionOptimizer.Emit.cs

@@ -247,9 +247,9 @@ public override bool IsDynamic(Assembly assembly)
         {
             try
             {
-                var isDyanmic = assembly is AssemblyBuilder
-                                || string.IsNullOrEmpty(assembly.Location);
-                return isDyanmic;
+                var isDynamic = assembly is AssemblyBuilder
+                    || string.IsNullOrEmpty(assembly.Location);
+                return isDynamic;
             }
             catch (NotSupportedException)
             {

src/ServiceStack.Text/RuntimeSerializableAttribute.cs

@@ -3,13 +3,13 @@
 namespace ServiceStack.Text
 {
     /// <summary>
-    /// Allow Type to be deserialized into late-bould object Types using __type info
+    /// Allow Type to be deserialized into late-bound object Types using __type info
     /// </summary>
     [AttributeUsage(AttributeTargets.Class)]
     public class RuntimeSerializableAttribute : Attribute {}
 
     /// <summary>
-    /// Allow Type to be deserialized into late-bould object Types using __type info
+    /// Allow Type to be deserialized into late-bound object Types using __type info
     /// </summary>
     public interface IRuntimeSerializable { }
 }

src/ServiceStack.Text/StringBuilderCache.cs

@@ -67,7 +67,7 @@ public static string ReturnAndFree(StringBuilder sb)
         }
     }
 
-    //Use separate cache internally to avoid reallocations and cache misses
+    //Use separate cache internally to avoid re-allocations and cache misses
     internal static class StringBuilderThreadStatic
     {
         [ThreadStatic]

src/ServiceStack.Text/StringExtensions.cs

@@ -38,19 +38,19 @@ public static string BaseConvert(this string source, int from, int to)
             var chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
             var len = source.Length;
             if (len == 0)
-                throw new Exception(Format("Parameter: '{0}' is not valid integer (in base {1}).", source, from));
+                throw new Exception($"Parameter: '{source}' is not valid integer (in base {@from}).");
             var minus = source[0] == '-' ? "-" : "";
             var src = minus == "" ? source : source.Substring(1);
             len = src.Length;
             if (len == 0)
-                throw new Exception(Format("Parameter: '{0}' is not valid integer (in base {1}).", source, from));
+                throw new Exception($"Parameter: '{source}' is not valid integer (in base {@from}).");
 
             var d = 0;
             for (int i = 0; i < len; i++) // Convert to decimal
             {
                 int c = chars.IndexOf(src[i]);
                 if (c >= from)
-                    throw new Exception(Format("Parameter: '{0}' is not valid integer (in base {1}).", source, from));
+                    throw new Exception($"Parameter: '{source}' is not valid integer (in base {@from}).");
                 d = d * from + c;
             }
             if (to == 10 || d == 0)
@@ -227,7 +227,7 @@ public static string ToRot13(this string value)
         public static string WithTrailingSlash(this string path)
         {
             if (String.IsNullOrEmpty(path))
-                throw new ArgumentNullException("path");
+                throw new ArgumentNullException(nameof(path));
 
             if (path[path.Length - 1] != '/')
             {
@@ -650,22 +650,22 @@ public static string ExtractContents(this string fromText, string startAfter, st
         public static string ExtractContents(this string fromText, string uniqueMarker, string startAfter, string endAt)
         {
             if (String.IsNullOrEmpty(uniqueMarker))
-                throw new ArgumentNullException("uniqueMarker");
+                throw new ArgumentNullException(nameof(uniqueMarker));
             if (String.IsNullOrEmpty(startAfter))
-                throw new ArgumentNullException("startAfter");
+                throw new ArgumentNullException(nameof(startAfter));
             if (String.IsNullOrEmpty(endAt))
-                throw new ArgumentNullException("endAt");
+                throw new ArgumentNullException(nameof(endAt));
 
             if (String.IsNullOrEmpty(fromText)) return null;
 
-            var markerPos = fromText.IndexOf(uniqueMarker);
+            var markerPos = fromText.IndexOf(uniqueMarker, StringComparison.Ordinal);
             if (markerPos == -1) return null;
 
-            var startPos = fromText.IndexOf(startAfter, markerPos);
+            var startPos = fromText.IndexOf(startAfter, markerPos, StringComparison.Ordinal);
             if (startPos == -1) return null;
             startPos += startAfter.Length;
 
-            var endPos = fromText.IndexOf(endAt, startPos);
+            var endPos = fromText.IndexOf(endAt, startPos, StringComparison.Ordinal);
             if (endPos == -1) endPos = fromText.Length;
 
             return fromText.Substring(startPos, endPos - startPos);
@@ -881,7 +881,7 @@ public static string ToHttps(this string url)
         {
             if (url == null)
             {
-                throw new ArgumentNullException("url");
+                throw new ArgumentNullException(nameof(url));
             }
             return HttpRegex.Replace(url.Trim(), "https://");
         }