PR cleanup

Author: cloudRoutine

src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Collections/CollectionModulesConsistency.fs

@@ -10,8 +10,8 @@ open Utils
 
 /// helper function that creates labeled FsCheck properties for equality comparisons
 let consistency name sqs ls arr =
-    (sqs = arr) |@ (sprintf  "Seq.%s = %A, Array.%s = %A" name sqs name arr) .&. 
-    (ls  = arr) |@ (sprintf "List.%s = %A, Array.%s = %A" name ls name arr)
+    (sqs = arr) |@ (sprintf  "Seq.%s = '%A', Array.%s = '%A'" name sqs name arr) .&. 
+    (ls  = arr) |@ (sprintf "List.%s = '%A', Array.%s = '%A'" name ls name arr)
 
 
 let allPairs<'a when 'a : equality> (xs : list<'a>) (xs2 : list<'a>) =

src/fsharp/FSharp.Core/array.fs

@@ -7,7 +7,6 @@ namespace Microsoft.FSharp.Collections
     open System.Collections.Generic
     open Microsoft.FSharp.Primitives.Basics
     open Microsoft.FSharp.Core
-    open Microsoft.FSharp.Core.DetailedExceptions
     open Microsoft.FSharp.Collections
     open Microsoft.FSharp.Core.Operators
     open Microsoft.FSharp.Core.CompilerServices

src/fsharp/FSharp.Core/array2.fs

@@ -4,7 +4,6 @@ namespace Microsoft.FSharp.Collections
 
     open System
     open Microsoft.FSharp.Core
-    open Microsoft.FSharp.Core.DetailedExceptions
     open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
     open Microsoft.FSharp.Core.Operators
     open Microsoft.FSharp.Core.Operators.Checked

src/fsharp/FSharp.Core/array3.fs

@@ -5,7 +5,6 @@ namespace Microsoft.FSharp.Collections
     open System.Diagnostics
     open Microsoft.FSharp.Collections
     open Microsoft.FSharp.Core
-    open Microsoft.FSharp.Core.DetailedExceptions
     open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
     open Microsoft.FSharp.Core.Operators
     open Microsoft.FSharp.Core.Operators.Checked

src/fsharp/FSharp.Core/list.fs

@@ -3,7 +3,6 @@
 namespace Microsoft.FSharp.Collections
 
     open Microsoft.FSharp.Core
-    open Microsoft.FSharp.Core.DetailedExceptions
     open Microsoft.FSharp.Core.Operators
     open Microsoft.FSharp.Core.LanguagePrimitives
     open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators

src/fsharp/FSharp.Core/local.fs

@@ -2,7 +2,7 @@
 
 
 namespace Microsoft.FSharp.Core
-
+[<AutoOpen>]
 module internal DetailedExceptions =
     open System
     open Microsoft.FSharp.Core
@@ -74,7 +74,6 @@ module internal DetailedExceptions =
 namespace Microsoft.FSharp.Primitives.Basics 
 
 open Microsoft.FSharp.Core
-open Microsoft.FSharp.Core.DetailedExceptions
 open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
 open Microsoft.FSharp.Collections
 open Microsoft.FSharp.Core.Operators

src/fsharp/FSharp.Core/local.fsi

@@ -3,6 +3,7 @@
 namespace Microsoft.FSharp.Core
 open Microsoft.FSharp.Core
 
+[<AutoOpen>]
 module internal DetailedExceptions =
     val inline invalidArgFmt: arg:string -> format:string -> paramArray:obj array -> _
     val inline invalidOpFmt: format:string -> paramArray:obj array -> _

src/fsharp/FSharp.Core/seq.fs

@@ -8,7 +8,6 @@ namespace Microsoft.FSharp.Collections
     open System.Collections
     open System.Collections.Generic
     open Microsoft.FSharp.Core
-    open Microsoft.FSharp.Core.DetailedExceptions
     open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
     open Microsoft.FSharp.Core.Operators
     open Microsoft.FSharp.Control
@@ -456,38 +455,6 @@ namespace Microsoft.FSharp.Collections
 
         let bindG g cont = GenerateThen<_>.Bind(g,cont)
 
-        //let emptyG () =
-        //    { new Generator<_> with
-        //           member x.Apply = (fun () -> Stop)
-        //           member x.Disposer = None }
-        //
-        //let delayG f  =
-        //    { new Generator<_> with
-        //           member x.Apply = fun () -> Goto(f())
-        //           member x.Disposer = None }
-        //
-        //let useG (v: System.IDisposable) f =
-        //    { new Generator<_> with
-        //           member x.Apply = (fun () ->
-        //               let g = f v in
-        //               // We're leaving this generator but want to maintain the disposal on the target.
-        //               // Hence chain it into the disposer of the target
-        //               Goto(chainDisposeG v.Dispose g))
-        //           member x.Disposer = Some (fun () -> v.Dispose()) }
-        //
-        //let yieldG (v:'T) =
-        //    let yielded = ref false
-        //    { new Generator<_> with
-        //           member x.Apply = fun () -> if !yielded then Stop else (yielded := true; Yield(v))
-        //           member x.Disposer = None }
-        //
-        //let rec whileG gd b = if gd() then bindG (b()) (fun () -> whileG gd b) else emptyG()
-        //
-        //let yieldThenG x b = bindG (yieldG x) b
-        //
-        //let forG (v: seq<'T>) f =
-        //    let e = v.GetEnumerator() in
-        //    whileG e.MoveNext (fun () -> f e.Current)
 
         // Internal type. Drive an underlying generator. Crucially when the generator returns
         // a new generator we simply update our current generator and continue. Thus the enumerator
@@ -510,7 +477,6 @@ namespace Microsoft.FSharp.Collections
         // Defined as a type so we can optimize Enumerator/Generator chains in enumerateFromLazyGenerator
         // and GenerateFromEnumerator.
 
-
         [<Sealed>]
         type EnumeratorWrappingLazyGenerator<'T>(g:Generator<'T>) =
             let mutable g = g
@@ -565,7 +531,6 @@ namespace Microsoft.FSharp.Core.CompilerServices
     open System
     open System.Diagnostics
     open Microsoft.FSharp.Core
-    open Microsoft.FSharp.Core.DetailedExceptions
     open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
     open Microsoft.FSharp.Core.Operators
     open Microsoft.FSharp.Control
@@ -857,7 +822,6 @@ namespace Microsoft.FSharp.Collections
     open System.Collections.Generic
     open System.Reflection
     open Microsoft.FSharp.Core
-    open Microsoft.FSharp.Core.DetailedExceptions
     open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
     open Microsoft.FSharp.Core.Operators
     open Microsoft.FSharp.Core.CompilerServices

src/fsharp/FSharp.Core/string.fs

@@ -6,7 +6,6 @@ namespace Microsoft.FSharp.Core
     open System.Text
     open Microsoft.FSharp.Core.LanguagePrimitives.IntrinsicOperators
     open Microsoft.FSharp.Core.Operators
-    open Microsoft.FSharp.Core.DetailedExceptions
     open Microsoft.FSharp.Core.Operators.Checked
     open Microsoft.FSharp.Collections