refine exception shape

eiriktsarpalis · Sep 16, 2017 · 6d3ea1e · 6d3ea1e
1 parent 0ac2ae1
commit 6d3ea1e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+### 2.19
+* Refine exception shapes
+
 ### 2.18
 * Add Subtype shapes.
 

diff --git a/src/TypeShape.CSharp/Properties/AssemblyInfo.cs b/src/TypeShape.CSharp/Properties/AssemblyInfo.cs
@@ -4,14 +4,14 @@
 [assembly: AssemblyTitleAttribute("TypeShape.CSharp")]
 [assembly: AssemblyProductAttribute("TypeShape")]
 [assembly: AssemblyDescriptionAttribute("Practical Generic Programming in F#")]
-[assembly: AssemblyVersionAttribute("2.18")]
-[assembly: AssemblyFileVersionAttribute("2.18")]
+[assembly: AssemblyVersionAttribute("2.19")]
+[assembly: AssemblyFileVersionAttribute("2.19")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const System.String AssemblyTitle = "TypeShape.CSharp";
         internal const System.String AssemblyProduct = "TypeShape";
         internal const System.String AssemblyDescription = "Practical Generic Programming in F#";
-        internal const System.String AssemblyVersion = "2.18";
-        internal const System.String AssemblyFileVersion = "2.18";
+        internal const System.String AssemblyVersion = "2.19";
+        internal const System.String AssemblyFileVersion = "2.19";
     }
 }
diff --git a/src/TypeShape/AssemblyInfo.fs b/src/TypeShape/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("TypeShape")>]
 [<assembly: AssemblyProductAttribute("TypeShape")>]
 [<assembly: AssemblyDescriptionAttribute("Practical Generic Programming in F#")>]
-[<assembly: AssemblyVersionAttribute("2.18")>]
-[<assembly: AssemblyFileVersionAttribute("2.18")>]
+[<assembly: AssemblyVersionAttribute("2.19")>]
+[<assembly: AssemblyFileVersionAttribute("2.19")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "TypeShape"
     let [<Literal>] AssemblyProduct = "TypeShape"
     let [<Literal>] AssemblyDescription = "Practical Generic Programming in F#"
-    let [<Literal>] AssemblyVersion = "2.18"
-    let [<Literal>] AssemblyFileVersion = "2.18"
+    let [<Literal>] AssemblyVersion = "2.19"
+    let [<Literal>] AssemblyFileVersion = "2.19"
diff --git a/src/TypeShape/TypeShape.fs b/src/TypeShape/TypeShape.fs
@@ -460,13 +460,13 @@ type private ShapeFSharpFunc<'Domain, 'CoDomain> () =
 // System.Exception
 
 type IExceptionVisitor<'R> =
-    abstract Visit<'exn when 'exn :> exn> : unit -> 'R
+    abstract Visit<'exn when 'exn :> exn and 'exn : not struct and 'exn : null> : unit -> 'R
 
 type IShapeException =
     abstract IsFSharpException : bool
     abstract Accept : IExceptionVisitor<'R> -> 'R
 
-type private ShapeException<'exn when 'exn :> exn> (isFSharpExn : bool) =
+type private ShapeException<'exn when 'exn :> exn and 'exn : not struct and 'exn : null> (isFSharpExn : bool) =
     interface IShapeException with
         member __.IsFSharpException = isFSharpExn
         member __.Accept v = v.Visit<'exn> ()

diff --git a/tests/TypeShape.Tests/Tests.fs b/tests/TypeShape.Tests/Tests.fs
@@ -357,7 +357,7 @@ let ``Shape FSharpFunc`` () =
 let ``Shape Exception`` () =
     let accepter =
         { new IExceptionVisitor<bool> with
-            member __.Visit<'exn when 'exn :> exn>() = typeof<'exn> = typeof<System.IO.FileNotFoundException> }
+            member __.Visit<'exn when 'exn :> exn and 'exn : not struct and 'exn : null>() = typeof<'exn> = typeof<System.IO.FileNotFoundException> }
     test <@ match shapeof<System.IO.FileNotFoundException> with Shape.Exception s -> s.Accept accepter | _ -> false @>
 
 [<Fact>]