Cleanup

Author: andrewvk

CodeJam.Main/Collections/ComparerBuilder.cs

@@ -5,8 +5,6 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-// ReSharper disable once RedundantUsingDirective
-
 using JetBrains.Annotations;
 
 namespace CodeJam.Collections
@@ -150,6 +148,7 @@ private static Func<T, T, bool> CreateEqualsFunc([NotNull] IEnumerable<LambdaExp
 				var mi = eq.GetMethods().Single(m => m.IsPublic && m.Name == "Equals" && m.GetParameters().Length == 2);
 
 				DebugCode.BugIf(pi is null, "pi != null");
+				// ReSharper disable once AssignNullToNotNullAttribute
 				return (Expression)Expression.Call(Expression.Property(null, pi), mi, arg0, arg1);
 			});
 
@@ -180,6 +179,7 @@ private static Func<T, int> CreateGetHashCodeFunc([NotNull] IEnumerable<LambdaEx
 					DebugCode.BugIf(pi is null, "pi != null");
 					return Expression.Add(
 						Expression.Multiply(e, Expression.Constant(-1521134295)),
+						// ReSharper disable once AssignNullToNotNullAttribute
 						Expression.Call(Expression.Property(null, pi), mi, ma));
 				});
 

CodeJam.Main/Collections/Enumerable/EnumerableExtensions.Backported.cs

@@ -2,6 +2,7 @@
 
 using JetBrains.Annotations;
 
+// ReSharper disable once CheckNamespace
 namespace CodeJam.Collections.Backported
 {
 	/// <summary>

CodeJam.Main/ConnectionStrings/ConnectionStringBase.ConnectionWrapper.cs

@@ -24,7 +24,7 @@ private class StringBuilderWrapper : DbConnectionStringBuilder
 
 			private static IReadOnlyDictionary<string, KeywordDescriptor> GetDescriptorsCore(Type type)
 			{
-				KeywordDescriptor GetDescriptor(PropertyInfo property) =>
+				static KeywordDescriptor GetDescriptor(PropertyInfo property) =>
 					new KeywordDescriptor(
 						property.Name,
 						property.PropertyType,

CodeJam.Main/ConnectionStrings/ConnectionStringBase.cs

@@ -17,6 +17,7 @@ public abstract partial class ConnectionStringBase : IDictionary<string, object>
 		/// <summary>
 		/// Descriptor for connection string keyword
 		/// </summary>
+		[PublicAPI]
 		protected class KeywordDescriptor
 		{
 			/// <summary>
@@ -55,10 +56,8 @@ public KeywordDescriptor(string name, Type valueType, bool isRequired, bool isBr
 
 		/// <summary>Initializes a new instance of the <see cref="ConnectionStringBase" /> class.</summary>
 		/// <param name="connectionString">The connection string.</param>
-		protected ConnectionStringBase([CanBeNull] string connectionString)
-		{
+		protected ConnectionStringBase([CanBeNull] string connectionString) =>
 			_wrapper = new StringBuilderWrapper(connectionString, GetType());
-		}
 
 		/// <summary>
 		/// Gets all supported keywords for current connection.

CodeJam.Main/DisposableExtensions.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+#if NETSTANDARD21_OR_GREATER || NETCOREAPP30_OR_GREATER
 using System.Threading.Tasks;
+#endif
 
 using CodeJam.Internal;
 

CodeJam.Main/Expressions/ExpressionExtensions.cs

@@ -323,6 +323,9 @@ void Action(MemberBinding b)
 						VisitInternal(expr.Reduce(), func);
 					break;
 				}
+
+				default:
+					break;
 			}
 
 			func(expr);

CodeJam.Main/Ranges/[RangeExtensions]/CompositeRangeExtensions.cs

@@ -100,17 +100,17 @@ public static CompositeRange<T, TKey> ToCompositeRangeFrom<TSource, T, TKey>(
 			{
 				if (prevBoundary != rangeFrom)
 				{
-					foreach (var prevKey in prevKeys)
-						ranges.Add(Range.Create(prevBoundary, rangeFrom.GetComplementation(), prevKey));
+					ranges.AddRange(
+						prevKeys.Select(prevKey => Range.Create(prevBoundary, rangeFrom.GetComplementation(), prevKey)));
 					prevKeys.Clear();
 					prevBoundary = rangeFrom;
 				}
 
 				prevKeys.Add(key);
 			}
 
-			foreach (var prevKey in prevKeys)
-				ranges.Add(Range.Create(prevBoundary, RangeBoundaryTo<T>.PositiveInfinity, prevKey));
+			ranges.AddRange(
+				prevKeys.Select(prevKey => Range.Create(prevBoundary, RangeBoundaryTo<T>.PositiveInfinity, prevKey)));
 
 			return ranges.ToCompositeRange();
 		}

CodeJam.Main/Readme.txt

@@ -1,6 +1,12 @@
-CodeJam 3.0.0-beta1 Release Notes
+CodeJam 3.0.0-beta3 Release Notes
 ---------------------------------
 
+What's new in 3.0.1-beta3
+-------------------------
+* IsAssignableTo() reflection helper.
+* Deconstruct methods for arrays, lists and enumerables (to support positional pattern).
+* Code cleanup
+
 What's new in 3.0.1-beta2
 -------------------------
 * Connection string parser/formatter class

CodeJam.Main/Reflection/TypeAccessorT.cs

@@ -15,6 +15,7 @@ namespace CodeJam.Reflection
 	/// Provides fast access to type and its members.
 	/// </summary>
 	/// <typeparam name="T">Type to access.</typeparam>
+	[PublicAPI]
 	public class TypeAccessor<T> : TypeAccessor
 	{
 		static TypeAccessor()

CodeJam.Main/Structures/Option/Option`1.cs

@@ -155,7 +155,7 @@ public sealed class Some : Option<T>
 		public sealed class None : Option<T>
 		{
 			[NotNull]
-			internal static None Instance = new None();
+			internal static readonly None Instance = new None();
 
 			private None() { }