Skip to content

Commit 008465a

Browse files
wallymathieuwallymathieu
committed
Compilation error and surface area tests
1 parent 3d324d1 commit 008465a

File tree

8 files changed

+412
-412
lines changed

8 files changed

+412
-412
lines changed

‎src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Core/ResultTests.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ type EmailValidation=
1414
| NoAt
1515

1616
module Results=
17-
let bind f m = match m with Error e -> Error e | Success x -> f x
17+
let bind f m = match m with Error e -> Error e | Ok x -> f x
1818

1919
open Results
2020

2121
[<TestFixture>]
2222
type ResultTests() =
2323

2424
let fail_if_empty email=
25-
if String.IsNullOrEmpty(email) then Error Empty else Success email
25+
if String.IsNullOrEmpty(email) then Error Empty else Ok email
2626

2727
let fail_if_not_at (email:string)=
28-
if (email.Contains("@")) then Success email else Error NoAt
28+
if (email.Contains("@")) then Ok email else Error NoAt
2929

3030
let validate_email =
3131
fail_if_empty
@@ -40,5 +40,5 @@ type ResultTests() =
4040
member this.CanChainTogetherSuccessiveValidations() =
4141
test_validate_email "" (Error Empty)
4242
test_validate_email "something_else" (Error NoAt)
43-
test_validate_email "some@email.com" (Success "some@email.com")
43+
test_validate_email "some@email.com" (Ok "some@email.com")
4444

‎src/fsharp/FSharp.Core.Unittests/SurfaceArea.Silverlight.2.0.fs‎

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1821,69 +1821,69 @@ Microsoft.FSharp.Core.FSharpRef`1[T]: T get_contents()
18211821
Microsoft.FSharp.Core.FSharpRef`1[T]: Void .ctor(T)
18221822
Microsoft.FSharp.Core.FSharpRef`1[T]: Void set_Value(T)
18231823
Microsoft.FSharp.Core.FSharpRef`1[T]: Void set_contents(T)
1824-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Boolean Equals(Microsoft.FSharp.Core.FSharpResult`2[T1,T2])
1825-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Boolean Equals(System.Object)
1826-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Boolean Equals(System.Object, System.Collections.IEqualityComparer)
1827-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Boolean IsError
1828-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Boolean IsSuccess
1829-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Boolean get_IsError()
1830-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Boolean get_IsSuccess()
1831-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Int32 CompareTo(Microsoft.FSharp.Core.FSharpResult`2[T1,T2])
1832-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Int32 CompareTo(System.Object)
1833-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Int32 CompareTo(System.Object, System.Collections.IComparer)
1834-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Int32 GetHashCode()
1835-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Int32 GetHashCode(System.Collections.IEqualityComparer)
1836-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Int32 Tag
1837-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: Int32 get_Tag()
1838-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: System.String ToString()
1839-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: System.Type GetType()
1840-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: T2 Item
1841-
Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]: T2 get_Item()
1842-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Boolean Equals(Microsoft.FSharp.Core.FSharpResult`2[T1,T2])
1843-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Boolean Equals(System.Object)
1844-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Boolean Equals(System.Object, System.Collections.IEqualityComparer)
1845-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Boolean IsError
1846-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Boolean IsSuccess
1847-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Boolean get_IsError()
1848-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Boolean get_IsSuccess()
1849-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Int32 CompareTo(Microsoft.FSharp.Core.FSharpResult`2[T1,T2])
1850-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Int32 CompareTo(System.Object)
1851-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Int32 CompareTo(System.Object, System.Collections.IComparer)
1852-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Int32 GetHashCode()
1853-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Int32 GetHashCode(System.Collections.IEqualityComparer)
1854-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Int32 Tag
1855-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: Int32 get_Tag()
1856-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: System.String ToString()
1857-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: System.Type GetType()
1858-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: T1 Item
1859-
Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]: T1 get_Item()
1860-
Microsoft.FSharp.Core.FSharpResult`2+Tags[T1,T2]: Boolean Equals(System.Object)
1861-
Microsoft.FSharp.Core.FSharpResult`2+Tags[T1,T2]: Int32 Error
1862-
Microsoft.FSharp.Core.FSharpResult`2+Tags[T1,T2]: Int32 GetHashCode()
1863-
Microsoft.FSharp.Core.FSharpResult`2+Tags[T1,T2]: Int32 Success
1864-
Microsoft.FSharp.Core.FSharpResult`2+Tags[T1,T2]: System.String ToString()
1865-
Microsoft.FSharp.Core.FSharpResult`2+Tags[T1,T2]: System.Type GetType()
1866-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Boolean Equals(Microsoft.FSharp.Core.FSharpResult`2[T1,T2])
1867-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Boolean Equals(System.Object)
1868-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Boolean Equals(System.Object, System.Collections.IEqualityComparer)
1869-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Boolean IsError
1870-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Boolean IsSuccess
1871-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Boolean get_IsError()
1872-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Boolean get_IsSuccess()
1873-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Int32 CompareTo(Microsoft.FSharp.Core.FSharpResult`2[T1,T2])
1874-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Int32 CompareTo(System.Object)
1875-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Int32 CompareTo(System.Object, System.Collections.IComparer)
1876-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Int32 GetHashCode()
1877-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Int32 GetHashCode(System.Collections.IEqualityComparer)
1878-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Int32 Tag
1879-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Int32 get_Tag()
1880-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Microsoft.FSharp.Core.FSharpResult`2+Error[T1,T2]
1881-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Microsoft.FSharp.Core.FSharpResult`2+Success[T1,T2]
1882-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Microsoft.FSharp.Core.FSharpResult`2+Tags[T1,T2]
1883-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Microsoft.FSharp.Core.FSharpResult`2[T1,T2] NewError(T2)
1884-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: Microsoft.FSharp.Core.FSharpResult`2[T1,T2] NewSuccess(T1)
1885-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: System.String ToString()
1886-
Microsoft.FSharp.Core.FSharpResult`2[T1,T2]: System.Type GetType()
1824+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Boolean Equals(Microsoft.FSharp.Core.FSharpResult`2[TOk,TError])
1825+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Boolean Equals(System.Object)
1826+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Boolean Equals(System.Object, System.Collections.IEqualityComparer)
1827+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Boolean IsError
1828+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Boolean IsOk
1829+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Boolean get_IsError()
1830+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Boolean get_IsOk()
1831+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Int32 CompareTo(Microsoft.FSharp.Core.FSharpResult`2[TOk,TError])
1832+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Int32 CompareTo(System.Object)
1833+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Int32 CompareTo(System.Object, System.Collections.IComparer)
1834+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Int32 GetHashCode()
1835+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Int32 GetHashCode(System.Collections.IEqualityComparer)
1836+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Int32 Tag
1837+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: Int32 get_Tag()
1838+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: System.String ToString()
1839+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: System.Type GetType()
1840+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: TError Item
1841+
Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]: TError get_Item()
1842+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Boolean Equals(Microsoft.FSharp.Core.FSharpResult`2[TOk,TError])
1843+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Boolean Equals(System.Object)
1844+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Boolean Equals(System.Object, System.Collections.IEqualityComparer)
1845+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Boolean IsError
1846+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Boolean IsOk
1847+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Boolean get_IsError()
1848+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Boolean get_IsOk()
1849+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Int32 CompareTo(Microsoft.FSharp.Core.FSharpResult`2[TOk,TError])
1850+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Int32 CompareTo(System.Object)
1851+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Int32 CompareTo(System.Object, System.Collections.IComparer)
1852+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Int32 GetHashCode()
1853+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Int32 GetHashCode(System.Collections.IEqualityComparer)
1854+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Int32 Tag
1855+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: Int32 get_Tag()
1856+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: System.String ToString()
1857+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: System.Type GetType()
1858+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: TOk Item
1859+
Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]: TOk get_Item()
1860+
Microsoft.FSharp.Core.FSharpResult`2+Tags[TOk,TError]: Boolean Equals(System.Object)
1861+
Microsoft.FSharp.Core.FSharpResult`2+Tags[TOk,TError]: Int32 Error
1862+
Microsoft.FSharp.Core.FSharpResult`2+Tags[TOk,TError]: Int32 GetHashCode()
1863+
Microsoft.FSharp.Core.FSharpResult`2+Tags[TOk,TError]: Int32 Ok
1864+
Microsoft.FSharp.Core.FSharpResult`2+Tags[TOk,TError]: System.String ToString()
1865+
Microsoft.FSharp.Core.FSharpResult`2+Tags[TOk,TError]: System.Type GetType()
1866+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Boolean Equals(Microsoft.FSharp.Core.FSharpResult`2[TOk,TError])
1867+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Boolean Equals(System.Object)
1868+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Boolean Equals(System.Object, System.Collections.IEqualityComparer)
1869+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Boolean IsError
1870+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Boolean IsOk
1871+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Boolean get_IsError()
1872+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Boolean get_IsOk()
1873+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Int32 CompareTo(Microsoft.FSharp.Core.FSharpResult`2[TOk,TError])
1874+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Int32 CompareTo(System.Object)
1875+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Int32 CompareTo(System.Object, System.Collections.IComparer)
1876+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Int32 GetHashCode()
1877+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Int32 GetHashCode(System.Collections.IEqualityComparer)
1878+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Int32 Tag
1879+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Int32 get_Tag()
1880+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Microsoft.FSharp.Core.FSharpResult`2+Error[TOk,TError]
1881+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Microsoft.FSharp.Core.FSharpResult`2+Ok[TOk,TError]
1882+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Microsoft.FSharp.Core.FSharpResult`2+Tags[TOk,TError]
1883+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Microsoft.FSharp.Core.FSharpResult`2[TOk,TError] NewError(TError)
1884+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: Microsoft.FSharp.Core.FSharpResult`2[TOk,TError] NewOk(TOk)
1885+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: System.String ToString()
1886+
Microsoft.FSharp.Core.FSharpResult`2[TOk,TError]: System.Type GetType()
18871887
Microsoft.FSharp.Core.FSharpTypeFunc: Boolean Equals(System.Object)
18881888
Microsoft.FSharp.Core.FSharpTypeFunc: Int32 GetHashCode()
18891889
Microsoft.FSharp.Core.FSharpTypeFunc: System.Object Specialize[T]()

0 commit comments

Comments
 (0)