Skip to content

Commit 0edb614

Browse files
authored
Merge pull request #10125 from dotnet/merges/main-to-release/dev16.8
Merge main to release/dev16.8
2 parents 88ca259 + 24c055d commit 0edb614

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+5798
-4841
lines changed

src/absil/illib.fs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,12 @@ module List =
420420

421421
let mapiFoldSquared f z xss = mapFoldSquared f z (xss |> mapiSquared (fun i j x -> (i, j, x)))
422422

423+
let duplicates (xs: 'T list) =
424+
xs
425+
|> List.groupBy id
426+
|> List.filter (fun (_, elems) -> Seq.length elems > 1)
427+
|> List.map fst
428+
423429
module ResizeArray =
424430

425431
/// Split a ResizeArray into an array of smaller chunks.

src/fsharp/CompileOps.fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ let warningOn err level specificWarnOn =
404404
| 1182 -> false // chkUnusedValue - off by default
405405
| 3218 -> false // ArgumentsInSigAndImplMismatch - off by default
406406
| 3180 -> false // abImplicitHeapAllocation - off by default
407+
| 3390 -> false // xmlDocBadlyFormed - off by default
407408
| _ -> level >= GetWarningLevel err
408409

409410
let SplitRelatedDiagnostics(err: PhasedDiagnostic) : PhasedDiagnostic * PhasedDiagnostic list =

src/fsharp/FSComp.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,3 +1540,10 @@ forFormatInvalidForInterpolated4,"Interpolated strings used as type IFormattable
15401540
3382,parsEmptyFillInInterpolatedString,"Invalid interpolated string. This interpolated string expression fill is empty, an expression was expected."
15411541
3383,lexRBraceInInterpolatedString,"A '}}' character must be escaped (by doubling) in an interpolated string."
15421542
#3501 "This construct is not supported by your version of the F# compiler" CompilerMessage(ExperimentalAttributeMessages.NotSupportedYet, 3501, IsError=true)
1543+
3390,xmlDocBadlyFormed,"This XML comment is invalid: '%s'"
1544+
3390,xmlDocMissingParameterName,"This XML comment is invalid: missing 'name' attribute for parameter or parameter reference"
1545+
3390,xmlDocMissingCrossReference,"This XML comment is invalid: missing 'cref' attribute for cross-reference"
1546+
3390,xmlDocInvalidParameterName,"This XML comment is invalid: unknown parameter '%s'"
1547+
3390,xmlDocDuplicateParameter,"This XML comment is invalid: multiple documentation entries for parameter '%s'"
1548+
3390,xmlDocUnresolvedCrossReference,"This XML comment is invalid: unresolved cross-reference '%s'"
1549+
3390,xmlDocMissingParameter,"This XML comment is incomplete: no documentation for parameter '%s'"

src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
1313
<DefineConstants>$(DefineConstants);MSBUILD_AT_LEAST_15</DefineConstants>
1414
<DefineConstants>$(DefineConstants);LOCALIZATION_FCOMP</DefineConstants>
15-
<OtherFlags>$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
15+
<OtherFlags>$(OtherFlags) --warnon:1182 /warnon:3390 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
1616
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
1717
</PropertyGroup>
1818

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<DefineConstants>$(DefineConstants);COMPILER_SERVICE_AS_DLL</DefineConstants>
1111
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
1212
<DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
13-
<OtherFlags>$(OtherFlags) /warnon:1182 --times</OtherFlags>
13+
<OtherFlags>$(OtherFlags) /warnon:1182 /warnon:3390 --times</OtherFlags>
1414
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
1515
<NGenBinary>true</NGenBinary>
1616

@@ -21,7 +21,7 @@
2121
<NuspecFile>FSharp.Compiler.Service.nuspec</NuspecFile>
2222
<IsPackable Condition="'$(OS)' != 'Unix'">true</IsPackable>
2323
<PackageDescription>The F# Compiler Services package For F# $(FSLanguageVersion) exposes additional functionality for implementing F# language bindings, additional tools based on the compiler or refactoring tools. The package also includes F# interactive service that can be used for embedding F# scripting into your applications. Contains code from the F# Software Foundation.</PackageDescription>
24-
<PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Compilere-Service-$(FSharpCompilerServiceReleaseNotesVersion)</PackageReleaseNotes>
24+
<PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Compiler-Service-$(FSharpCompilerServiceReleaseNotesVersion)</PackageReleaseNotes>
2525
<PackageTags>F#, fsharp, interactive, compiler, editor</PackageTags>
2626
</PropertyGroup>
2727

src/fsharp/FSharp.Core/FSharp.Core.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AllowCrossTargeting>true</AllowCrossTargeting>
1010
<DefineConstants>$(DefineConstants);FSHARP_CORE</DefineConstants>
1111
<DefineConstants Condition="'$(Configuration)' == 'Proto'">BUILDING_WITH_LKG;$(DefineConstants)</DefineConstants>
12-
<OtherFlags>$(OtherFlags) --warnon:1182 --compiling-fslib --compiling-fslib-40 --maxerrors:20 --extraoptimizationloops:1 --nowarn:57</OtherFlags>
12+
<OtherFlags>$(OtherFlags) --warnon:1182 --warnon:3390 --compiling-fslib --compiling-fslib-40 --maxerrors:100 --extraoptimizationloops:1 --nowarn:57</OtherFlags>
1313
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
1414
<NGenBinary>true</NGenBinary>
1515

src/fsharp/FSharp.Core/array.fsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ namespace Microsoft.FSharp.Collections
10101010
/// the remaining elements in a new array.</summary>
10111011
///
10121012
/// <param name="predicate">A function that evaluates an element of the array to a boolean value.</param>
1013-
/// <param name="source">The input array.</param>
1013+
/// <param name="array">The input array.</param>
10141014
///
10151015
/// <returns>The created sub array.</returns>
10161016
///
@@ -1293,7 +1293,7 @@ namespace Microsoft.FSharp.Collections
12931293
/// Returns <c>None</c> if index is negative or the input array does not contain enough elements.</summary>
12941294
///
12951295
/// <param name="index">The index of element to retrieve.</param>
1296-
/// <param name="source">The input array.</param>
1296+
/// <param name="array">The input array.</param>
12971297
///
12981298
/// <returns>The nth element of the array or <c>None</c>.</returns>
12991299
///

src/fsharp/FSharp.Core/async.fsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ namespace Microsoft.FSharp.Control
229229
/// for the other child computations to complete.</remarks>
230230
///
231231
/// <param name="computations">A sequence of distinct computations to be parallelized.</param>
232+
/// <param name="maxDegreeOfParallelism">The maximum degree of parallelism in the parallel execution.</param>
232233
///
233234
/// <returns>A computation that returns an array of values from the sequence of input computations.</returns>
234235
///

src/fsharp/FSharp.Core/eventmodule.fsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Microsoft.FSharp.Control
2222

2323
/// <summary>Returns a new event that passes values transformed by the given function.</summary>
2424
///
25-
/// <param name="map">The function to transform event values.</param>
25+
/// <param name="mapping">The function to transform event values.</param>
2626
/// <param name="sourceEvent">The input event.</param>
2727
///
2828
/// <returns>An event that passes the transformed values.</returns>

src/fsharp/FSharp.Core/list.fsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -956,7 +956,7 @@ namespace Microsoft.FSharp.Collections
956956
/// <summary>Returns at most N elements in a new list.</summary>
957957
///
958958
/// <param name="count">The maximum number of items to return.</param>
959-
/// <param name="array">The input list.</param>
959+
/// <param name="list">The input list.</param>
960960
///
961961
/// <returns>The result list.</returns>
962962
[<CompiledName("Truncate")>]

0 commit comments

Comments
 (0)