Move Result and OptionalResult into LanguageExt.Common namespace

- These types shouldn't really be used directly, so moving them away from the main namespace will reduce the possibility of clashes with other libaries or user code that uses the common name Result
louthy · Aug 21, 2019 · 55f36a3 · 55f36a3
1 parent 53588c0
commit 55f36a3
Show file tree

Hide file tree

Showing 41 changed files with 47 additions and 45 deletions.
diff --git a/LanguageExt.CodeGen/LanguageExt.CodeGen.csproj b/LanguageExt.CodeGen/LanguageExt.CodeGen.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Build">
+<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="Build">
 
     <PropertyGroup>
         <PackageVersion>3.3.18</PackageVersion>

diff --git a/LanguageExt.Core/ClassInstances/Applicative/ApplTryAsync.cs b/LanguageExt.Core/ClassInstances/Applicative/ApplTryAsync.cs
@@ -3,6 +3,7 @@
 using static LanguageExt.Prelude;
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
+using LanguageExt.Common;
 
 namespace LanguageExt.ClassInstances
 {

diff --git a/LanguageExt.Core/ClassInstances/Applicative/ApplTryOptionAsync.cs b/LanguageExt.Core/ClassInstances/Applicative/ApplTryOptionAsync.cs
@@ -3,6 +3,7 @@
 using static LanguageExt.Prelude;
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
+using LanguageExt.Common;
 
 namespace LanguageExt.ClassInstances
 {

diff --git a/LanguageExt.Core/ClassInstances/Eq/EqResult.cs b/LanguageExt.Core/ClassInstances/Eq/EqResult.cs
@@ -1,6 +1,6 @@
-
-using LanguageExt.TypeClasses;
+using LanguageExt.TypeClasses;
 using System.Reflection;
+using LanguageExt.Common;
 
 namespace LanguageExt.ClassInstances
 {

diff --git a/LanguageExt.Core/ClassInstances/Functor/FTryAsync.cs b/LanguageExt.Core/ClassInstances/Functor/FTryAsync.cs
@@ -1,4 +1,5 @@
 using System;
+using LanguageExt.Common;
 using LanguageExt.TypeClasses;
 using static LanguageExt.Prelude;
 using System.Diagnostics.Contracts;

diff --git a/LanguageExt.Core/ClassInstances/Functor/FTryOptionAsync.cs b/LanguageExt.Core/ClassInstances/Functor/FTryOptionAsync.cs
@@ -1,4 +1,5 @@
 using System;
+using LanguageExt.Common;
 using LanguageExt.TypeClasses;
 using static LanguageExt.Prelude;
 using System.Diagnostics.Contracts;

diff --git a/LanguageExt.Core/ClassInstances/Monad/MTry.cs b/LanguageExt.Core/ClassInstances/Monad/MTry.cs
@@ -2,6 +2,7 @@
 using LanguageExt.TypeClasses;
 using System.Diagnostics.Contracts;
 using static LanguageExt.Prelude;
+using LanguageExt.Common;
 
 namespace LanguageExt.ClassInstances
 {

diff --git a/LanguageExt.Core/ClassInstances/Monad/MTryAsync.cs b/LanguageExt.Core/ClassInstances/Monad/MTryAsync.cs
@@ -1,7 +1,7 @@
 using System;
 using LanguageExt.TypeClasses;
 using System.Diagnostics.Contracts;
-using static LanguageExt.Prelude;
+using LanguageExt.Common;
 using System.Threading.Tasks;
 
 namespace LanguageExt.ClassInstances

diff --git a/LanguageExt.Core/ClassInstances/Monad/MTryFirstAsync.cs b/LanguageExt.Core/ClassInstances/Monad/MTryFirstAsync.cs
@@ -1,4 +1,5 @@
 using System;
+using LanguageExt.Common;
 using LanguageExt.TypeClasses;
 using System.Diagnostics.Contracts;
 using static LanguageExt.Prelude;

diff --git a/LanguageExt.Core/ClassInstances/Monad/MTryOption.cs b/LanguageExt.Core/ClassInstances/Monad/MTryOption.cs
@@ -1,4 +1,5 @@
 using System;
+using LanguageExt.Common;
 using LanguageExt.TypeClasses;
 using System.Diagnostics.Contracts;
 using static LanguageExt.Prelude;

diff --git a/LanguageExt.Core/ClassInstances/Monad/MTryOptionAsync.cs b/LanguageExt.Core/ClassInstances/Monad/MTryOptionAsync.cs
@@ -2,6 +2,7 @@
 using LanguageExt.TypeClasses;
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
+using LanguageExt.Common;
 
 namespace LanguageExt.ClassInstances
 {

diff --git a/LanguageExt.Core/ClassInstances/Monad/MTryOptionFirstAsync.cs b/LanguageExt.Core/ClassInstances/Monad/MTryOptionFirstAsync.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using static LanguageExt.Prelude;
 using System.Threading.Tasks;
+using LanguageExt.Common;
 
 namespace LanguageExt.ClassInstances
 {

diff --git a/LanguageExt.Core/ClassInstances/Ord/OrdResult.cs b/LanguageExt.Core/ClassInstances/Ord/OrdResult.cs
@@ -1,4 +1,4 @@
-
+using LanguageExt.Common;
 using LanguageExt.TypeClasses;
 using System.Reflection;
 

diff --git a/...t.Core/DataTypes/Result/OptionalResult.cs → ...eExt.Core/Common/Result/OptionalResult.cs b/...t.Core/DataTypes/Result/OptionalResult.cs → ...eExt.Core/Common/Result/OptionalResult.cs
@@ -6,7 +6,7 @@
 using LanguageExt.ClassInstances;
 using System.Threading.Tasks;
 
-namespace LanguageExt
+namespace LanguageExt.Common
 {
     internal enum OptionalResultState : byte
     {

diff --git a/LanguageExt.Core/DataTypes/Result/Result.cs → LanguageExt.Core/Common/Result/Result.cs b/LanguageExt.Core/DataTypes/Result/Result.cs → LanguageExt.Core/Common/Result/Result.cs
@@ -5,7 +5,7 @@
 using LanguageExt.ClassInstances;
 using System.Threading.Tasks;
 
-namespace LanguageExt
+namespace LanguageExt.Common
 {
     public enum ResultState : byte
     {

diff --git a/LanguageExt.Core/DataTypes/RWS/RWS.Extensions.cs b/LanguageExt.Core/DataTypes/RWS/RWS.Extensions.cs
@@ -1,5 +1,6 @@
 using System;
 using LanguageExt;
+using LanguageExt.Common;
 using static LanguageExt.Prelude;
 using LanguageExt.ClassInstances;
 using LanguageExt.TypeClasses;

diff --git a/LanguageExt.Core/DataTypes/Reader/Reader.Extensions.cs b/LanguageExt.Core/DataTypes/Reader/Reader.Extensions.cs
@@ -1,13 +1,8 @@
 using System;
-using System.Linq;
 using LanguageExt;
-using LanguageExt.TypeClasses;
+using LanguageExt.Common;
 using static LanguageExt.Prelude;
-using static LanguageExt.TypeClass;
 using System.Diagnostics.Contracts;
-using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.ComponentModel;
 using LanguageExt.ClassInstances;
 
 /// <summary>

diff --git a/LanguageExt.Core/DataTypes/State/State.Extensions.cs b/LanguageExt.Core/DataTypes/State/State.Extensions.cs
@@ -1,10 +1,10 @@
 using System;
-using System.Linq;
 using LanguageExt;
 using static LanguageExt.Prelude;
 using System.Diagnostics.Contracts;
 using System.Collections.Generic;
 using LanguageExt.ClassInstances;
+using LanguageExt.Common;
 
 /// <summary>
 /// Extension methods for State

diff --git a/LanguageExt.Core/DataTypes/Try/Task.Try.Extensions.cs b/LanguageExt.Core/DataTypes/Try/Task.Try.Extensions.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
 using LanguageExt.TypeClasses;
-using System.Collections.Generic;
+using LanguageExt.Common;
 
 public static class TaskTryExtensions
 {

diff --git a/LanguageExt.Core/DataTypes/Try/Try.Extensions.Async.cs b/LanguageExt.Core/DataTypes/Try/Try.Extensions.Async.cs
@@ -1,14 +1,11 @@
 using System;
-using System.Linq;
-using System.ComponentModel;
 using LanguageExt;
 using static LanguageExt.Prelude;
 using static LanguageExt.TypeClass;
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
 using LanguageExt.TypeClasses;
-using System.Collections.Generic;
-using LanguageExt.ClassInstances;
+using LanguageExt.Common;
 
 /// <summary>
 /// Extension methods for the Try monad

diff --git a/LanguageExt.Core/DataTypes/Try/Try.Extensions.cs b/LanguageExt.Core/DataTypes/Try/Try.Extensions.cs
@@ -7,6 +7,7 @@
 using LanguageExt.TypeClasses;
 using static LanguageExt.Prelude;
 using static LanguageExt.TypeClass;
+using LanguageExt.Common;
 
 /// <summary>
 /// Extension methods for the Try monad

diff --git a/LanguageExt.Core/DataTypes/Try/Try.Prelude.cs b/LanguageExt.Core/DataTypes/Try/Try.Prelude.cs
@@ -1,9 +1,8 @@
 using LanguageExt.ClassInstances;
 using LanguageExt.TypeClasses;
-using static LanguageExt.TypeClass;
+using LanguageExt.Common;
 using System;
 using System.Diagnostics.Contracts;
-using System.Linq;
 using System.Collections.Generic;
 
 namespace LanguageExt

diff --git a/LanguageExt.Core/DataTypes/Try/Try.cs b/LanguageExt.Core/DataTypes/Try/Try.cs
@@ -1,4 +1,6 @@
-namespace LanguageExt
+using LanguageExt.Common;
+
+namespace LanguageExt
 {
     /// <summary>
     /// The Try monad captures exceptions and uses them to cancel the

diff --git a/LanguageExt.Core/DataTypes/TryAsync/TryAsync.Extensions.cs b/LanguageExt.Core/DataTypes/TryAsync/TryAsync.Extensions.cs
@@ -8,6 +8,7 @@
 using LanguageExt.TypeClasses;
 using System.Collections.Generic;
 using LanguageExt.ClassInstances;
+using LanguageExt.Common;
 
 /// <summary>
 /// Extension methods for the TryAsync monad

diff --git a/LanguageExt.Core/DataTypes/TryAsync/TryAsync.Prelude.cs b/LanguageExt.Core/DataTypes/TryAsync/TryAsync.Prelude.cs
@@ -1,9 +1,8 @@
 using LanguageExt.ClassInstances;
 using LanguageExt.TypeClasses;
-using static LanguageExt.TypeClass;
+using LanguageExt.Common;
 using System;
 using System.Diagnostics.Contracts;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace LanguageExt

diff --git a/LanguageExt.Core/DataTypes/TryAsync/TryAsync.cs b/LanguageExt.Core/DataTypes/TryAsync/TryAsync.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using LanguageExt.Common;
 
 namespace LanguageExt
 {

diff --git a/LanguageExt.Core/DataTypes/TryOption/Task.TryOption.Extensions.cs b/LanguageExt.Core/DataTypes/TryOption/Task.TryOption.Extensions.cs
@@ -1,14 +1,9 @@
 using System;
-using System.Linq;
 using LanguageExt;
-using static LanguageExt.Prelude;
-using static LanguageExt.TypeClass;
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
 using LanguageExt.TypeClasses;
-using LanguageExt.ClassInstances;
-using System.ComponentModel;
-using System.Collections.Generic;
+using LanguageExt.Common;
 
 public static class TaskTryOptionExtensions
 {

diff --git a/LanguageExt.Core/DataTypes/TryOption/TryOption.Extensions.Async.cs b/LanguageExt.Core/DataTypes/TryOption/TryOption.Extensions.Async.cs
@@ -1,14 +1,10 @@
 using System;
-using System.Linq;
 using LanguageExt;
 using static LanguageExt.Prelude;
-using static LanguageExt.TypeClass;
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
 using LanguageExt.TypeClasses;
-using LanguageExt.ClassInstances;
-using System.ComponentModel;
-using System.Collections.Generic;
+using LanguageExt.Common;
 
 /// <summary>
 /// Extension methods for the Try monad

diff --git a/LanguageExt.Core/DataTypes/TryOption/TryOption.Extensions.cs b/LanguageExt.Core/DataTypes/TryOption/TryOption.Extensions.cs
@@ -9,6 +9,7 @@
 using LanguageExt.ClassInstances;
 using System.ComponentModel;
 using System.Collections.Generic;
+using LanguageExt.Common;
 
 /// <summary>
 /// Extension methods for the Try monad

diff --git a/LanguageExt.Core/DataTypes/TryOption/TryOption.Prelude.cs b/LanguageExt.Core/DataTypes/TryOption/TryOption.Prelude.cs
@@ -1,9 +1,8 @@
 using LanguageExt.ClassInstances;
 using LanguageExt.TypeClasses;
-using static LanguageExt.TypeClass;
+using LanguageExt.Common;
 using System;
 using System.Diagnostics.Contracts;
-using System.Linq;
 
 namespace LanguageExt
 {

diff --git a/LanguageExt.Core/DataTypes/TryOption/TryOption.cs b/LanguageExt.Core/DataTypes/TryOption/TryOption.cs
@@ -1,4 +1,5 @@
-
+using LanguageExt.Common;
+
 namespace LanguageExt
 {
     /// <summary>

diff --git a/LanguageExt.Core/DataTypes/TryOptionAsync/TryOptionAsync.Extensions.cs b/LanguageExt.Core/DataTypes/TryOptionAsync/TryOptionAsync.Extensions.cs
@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using LanguageExt.ClassInstances;
 using LanguageExt.DataTypes.Serialisation;
+using LanguageExt.Common;
 
 /// <summary>
 /// Extension methods for the TryOptionAsync monad

diff --git a/LanguageExt.Core/DataTypes/TryOptionAsync/TryOptionAsync.Prelude.cs b/LanguageExt.Core/DataTypes/TryOptionAsync/TryOptionAsync.Prelude.cs
@@ -1,9 +1,8 @@
 using LanguageExt.ClassInstances;
 using LanguageExt.TypeClasses;
-using static LanguageExt.TypeClass;
+using LanguageExt.Common;
 using System;
 using System.Diagnostics.Contracts;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace LanguageExt

diff --git a/LanguageExt.Core/DataTypes/TryOptionAsync/TryOptionAsync.cs b/LanguageExt.Core/DataTypes/TryOptionAsync/TryOptionAsync.cs
@@ -1,4 +1,5 @@
 using System.Threading.Tasks;
+using LanguageExt.Common;
 
 namespace LanguageExt
 {

diff --git a/LanguageExt.Core/DataTypes/Writer/Writer.Extensions.cs b/LanguageExt.Core/DataTypes/Writer/Writer.Extensions.cs
@@ -1,11 +1,10 @@
 using System;
-using System.Linq;
 using LanguageExt;
 using static LanguageExt.Prelude;
 using System.Diagnostics.Contracts;
-using System.Collections.Generic;
 using LanguageExt.ClassInstances;
 using LanguageExt.TypeClasses;
+using LanguageExt.Common;
 
 /// <summary>
 /// Extension methods for Writer

diff --git a/LanguageExt.Core/LanguageExt.Core.csproj b/LanguageExt.Core/LanguageExt.Core.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
     <PropertyGroup Label="Configuration" Condition="'$(Configuration)'=='Debug'">
         <DefineConstants>TRACE;DEBUG</DefineConstants>
     </PropertyGroup>

diff --git a/LanguageExt.Core/Utility/ExceptionMatch/ExceptionMatchAsync.cs b/LanguageExt.Core/Utility/ExceptionMatch/ExceptionMatchAsync.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
 using static LanguageExt.Prelude;
+using LanguageExt.Common;
 
 namespace LanguageExt
 {
@@ -126,4 +127,4 @@ public static class ExceptionAsyncExtensions
         public static LanguageExt.ExceptionMatchAsync<R> Match<R>(this Task<Result<R>> self) =>
             new LanguageExt.ExceptionMatchAsync<R>(self);
     }
-}
+}
diff --git a/LanguageExt.Core/Utility/ExceptionMatch/ExceptionMatchOptionalAsync.cs b/LanguageExt.Core/Utility/ExceptionMatch/ExceptionMatchOptionalAsync.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.Contracts;
 using System.Threading.Tasks;
 using static LanguageExt.Prelude;
+using LanguageExt.Common;
 
 namespace LanguageExt
 {

diff --git a/LanguageExt.Tests/ResultTests.cs b/LanguageExt.Tests/ResultTests.cs
@@ -1,4 +1,5 @@
 using System;
+using LanguageExt.Common;
 
 using Xunit;
 
@@ -291,4 +292,4 @@ public void TestMapWithFaultWithNullException()
         private readonly Result<int> faultResult = new Result<int>(new InvalidOperationException());
         private readonly Result<int> faultWithNullException = new Result<int>((Exception) null);
     }
-}
+}
diff --git a/Samples/Records/Program.cs b/Samples/Records/Program.cs
@@ -1,4 +1,5 @@
 using System;
+using LanguageExt.Common;
 
 namespace Records
 {

diff --git a/Samples/TestBed/Program.cs b/Samples/TestBed/Program.cs
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Reflection;
 using LanguageExt;
+using LanguageExt.Common;
 using Newtonsoft.Json;
 using System.Runtime.Serialization;
 using static LanguageExt.Prelude;