Cleanup

Author: andrewvk

Main/src/OptionExtensions.cs

@@ -16,9 +16,12 @@ public static class OptionExtensions
 		/// </summary>
 		public static void Match<T>(
 			this Option<T> option,
-			[InstantHandle]Action<Option<T>> someAction,
-			[InstantHandle]Action noneAction)
+			[NotNull, InstantHandle]Action<Option<T>> someAction,
+			[NotNull, InstantHandle]Action noneAction)
 		{
+			Code.NotNull(someAction, nameof(someAction));
+			Code.NotNull(noneAction, nameof(noneAction));
+
 			if (option.HasValue)
 				someAction(option);
 			else
@@ -32,9 +35,14 @@ public static void Match<T>(
 		[Pure]
 		public static TResult Match<T, TResult>(
 			this Option<T> option,
-			[InstantHandle] Func<Option<T>, TResult> someFunc,
-			[InstantHandle] Func<TResult> noneFunc) =>
-				option.HasValue ? someFunc(option) : noneFunc();
+			[NotNull, InstantHandle] Func<Option<T>, TResult> someFunc,
+			[NotNull, InstantHandle] Func<TResult> noneFunc)
+		{
+			Code.NotNull(someFunc, nameof(someFunc));
+			Code.NotNull(noneFunc, nameof(noneFunc));
+
+			return option.HasValue ? someFunc(option) : noneFunc();
+		}
 
 		/// <summary>
 		/// Returns value of <paramref name="option"/>, or <paramref name="defaultValue"/> if <paramref name="option"/>
@@ -50,7 +58,11 @@ public static TResult Match<T, TResult>(
 		[Pure]
 		public static Option<TResult> Map<T, TResult>(
 			this Option<T> option,
-			[InstantHandle] Func<T, TResult> selectFunc) =>
-				option.HasValue ? new Option<TResult>(selectFunc(option.Value)) : new Option<TResult>();
+			[InstantHandle] Func<T, TResult> selectFunc)
+		{
+			Code.NotNull(selectFunc, nameof(selectFunc));
+
+			return option.HasValue ? new Option<TResult>(selectFunc(option.Value)) : new Option<TResult>();
+		}
 	}
 }

Main/src/Structures/ObjectPools/PooledObject.cs

@@ -9,6 +9,7 @@ namespace CodeJam.ObjectPools
 	/// <summary>
 	/// The RAII object to automatically release pooled object when its owning pool.
 	/// </summary>
+	// BASEDON: https://github.com/dotnet/roslyn/blob/56f605c41915317ccdb925f66974ee52282609e7/src/Workspaces/Core/Portable/Utilities/ObjectPools/PooledObject.cs
 	[PublicAPI]
 	public struct PooledObject<T> : IDisposable where T : class
 	{

Main/src/Structures/ObjectPools/SharedPoolExtensions.cs

@@ -11,6 +11,7 @@ namespace CodeJam.ObjectPools
 	/// <summary>
 	/// The <see cref="ObjectPool{T}"/> extension.
 	/// </summary>
+	// BASEDON: https://github.com/dotnet/roslyn/blob/56f605c41915317ccdb925f66974ee52282609e7/src/Workspaces/Core/Portable/Utilities/ObjectPools/Extensions.cs
 	[PublicAPI]
 	public static class SharedPoolExtensions
 	{

Main/src/Structures/ObjectPools/SharedPools.cs

@@ -15,6 +15,7 @@ namespace CodeJam.ObjectPools
 	/// For example, if you want to create a million of small objects within a second, 
 	/// use the ObjectPool directly. it should have much less overhead than using this.
 	/// </summary>
+	// BASEDON: https://github.com/dotnet/roslyn/blob/56f605c41915317ccdb925f66974ee52282609e7/src/Workspaces/Core/Portable/Utilities/ObjectPools/SharedPools.cs
 	[PublicAPI]
 	public static class SharedPools
 	{