Skip to content

Commit

Permalink
Merge pull request #6523 from Microsoft/merges/master-to-fsharp5
Browse files Browse the repository at this point in the history
Merge master to fsharp5
  • Loading branch information
dotnet-automerge-bot authored Apr 13, 2019
2 parents 2ce5f48 + bbc46aa commit 36e7e97
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/fsharp/FSharp.Core/collections.fs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Microsoft.FSharp.Collections
member __.Equals(x,y) = LanguagePrimitives.PhysicalEquality x y }

let inline NonStructural< 'T when 'T : equality and 'T : (static member ( = ) : 'T * 'T -> bool) > =
{ new IEqualityComparer< 'T > with
{ new IEqualityComparer<'T> with
member __.GetHashCode(x) = NonStructuralComparison.hash x
member __.Equals(x, y) = NonStructuralComparison.(=) x y }

Expand All @@ -39,7 +39,7 @@ namespace Microsoft.FSharp.Collections
let inline Structural<'T when 'T : comparison > : IComparer<'T> =
LanguagePrimitives.FastGenericComparer<'T>

let inline NonStructural< 'T when 'T : (static member ( < ) : 'T * 'T -> bool) and 'T : (static member ( > ) : 'T * 'T -> bool) > : IComparer< 'T > =
let inline NonStructural< 'T when 'T : (static member ( < ) : 'T * 'T -> bool) and 'T : (static member ( > ) : 'T * 'T -> bool) > : IComparer<'T> =
{ new IComparer<'T> with
member __.Compare(x,y) = NonStructuralComparison.compare x y }

Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core/seq.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ namespace Microsoft.FSharp.Collections
LanguagePrimitives.DivideByInt< ^a> acc count

[<CompiledName("AverageBy")>]
let inline averageBy (projection : 'T -> ^U) (source: seq< 'T >) : ^U =
let inline averageBy (projection : 'T -> ^U) (source: seq<'T>) : ^U =
checkNonNull "source" source
use e = source.GetEnumerator()
let mutable acc = LanguagePrimitives.GenericZero< ^U>
Expand Down

0 comments on commit 36e7e97

Please sign in to comment.