From 325f8634a4efd0938f44b701648d2583771d9419 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 22:05:23 +0000 Subject: [PATCH] Bump FSharp.Core and WoofWare.Whippet.Fantomas (#361) * Bump FsCheck and FSharp.Core Bumps [FsCheck](https://github.com/Fscheck/fscheck) and [FSharp.Core](https://github.com/dotnet/fsharp). These dependencies needed to be updated together. Updates `FsCheck` from 3.1.0 to 3.2.0 - [Release notes](https://github.com/Fscheck/fscheck/releases) - [Changelog](https://github.com/fscheck/FsCheck/blob/master/FsCheck%20Release%20Notes.md) - [Commits](https://github.com/Fscheck/fscheck/compare/3.1.0...3.2.0) Updates `FSharp.Core` from 4.3.4 to 5.0.2 - [Release notes](https://github.com/dotnet/fsharp/releases) - [Changelog](https://github.com/dotnet/fsharp/blob/main/release-notes.md) - [Commits](https://github.com/dotnet/fsharp/commits) --- updated-dependencies: - dependency-name: FsCheck dependency-version: 3.2.0 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: FSharp.Core dependency-version: 5.0.2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Bump FSharp.Core and WoofWare.Whippet.Fantomas Bumps [FSharp.Core](https://github.com/dotnet/fsharp) and [WoofWare.Whippet.Fantomas](https://github.com/Smaug123/WoofWare.Whippet). These dependencies needed to be updated together. Updates `FSharp.Core` from 4.3.4 to 6.0.1 - [Release notes](https://github.com/dotnet/fsharp/releases) - [Changelog](https://github.com/dotnet/fsharp/blob/main/release-notes.md) - [Commits](https://github.com/dotnet/fsharp/commits) Updates `WoofWare.Whippet.Fantomas` from 0.3.2 to 0.5.1 - [Commits](https://github.com/Smaug123/WoofWare.Whippet/commits) --- updated-dependencies: - dependency-name: FSharp.Core dependency-version: 6.0.1 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: WoofWare.Whippet.Fantomas dependency-version: 0.5.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Smaug123 <3138005+Smaug123@users.noreply.github.com> --- .../WoofWare.Myriad.Plugins.Test.fsproj | 2 +- WoofWare.Myriad.Plugins/ArgParserGenerator.fs | 2 +- WoofWare.Myriad.Plugins/AstHelper.fs | 7 ------- WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs | 2 +- WoofWare.Myriad.Plugins/JsonParseGenerator.fs | 2 +- WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs | 2 +- WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj | 2 +- nix/deps.json | 8 ++++---- 8 files changed, 10 insertions(+), 17 deletions(-) diff --git a/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj b/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj index 639f8b5..c8f6a61 100644 --- a/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj +++ b/WoofWare.Myriad.Plugins.Test/WoofWare.Myriad.Plugins.Test.fsproj @@ -43,7 +43,7 @@ - + diff --git a/WoofWare.Myriad.Plugins/ArgParserGenerator.fs b/WoofWare.Myriad.Plugins/ArgParserGenerator.fs index 0235b11..fb33747 100644 --- a/WoofWare.Myriad.Plugins/ArgParserGenerator.fs +++ b/WoofWare.Myriad.Plugins/ArgParserGenerator.fs @@ -673,7 +673,7 @@ module internal ArgParserGenerator = args |> Map.toList |> List.map (fun (ident, expr) -> SynLongIdent.create [ Ident.create ident ], expr) - |> AstHelper.instantiateRecord + |> SynExpr.createRecord None ) tree, counter diff --git a/WoofWare.Myriad.Plugins/AstHelper.fs b/WoofWare.Myriad.Plugins/AstHelper.fs index 79a14b8..d168672 100644 --- a/WoofWare.Myriad.Plugins/AstHelper.fs +++ b/WoofWare.Myriad.Plugins/AstHelper.fs @@ -36,13 +36,6 @@ module internal AstHelper = | SynTypeDefnRepr.Simple (SynTypeDefnSimpleRepr.Enum _, _) -> true | _ -> false - let instantiateRecord (fields : (SynLongIdent * SynExpr) list) : SynExpr = - let fields = - fields - |> List.map (fun (rfn, synExpr) -> SynExprRecordField ((rfn, true), Some range0, Some synExpr, None)) - - SynExpr.Record (None, None, fields, range0) - let defineRecordType (record : RecordType) : SynTypeDefn = let name = SynComponentInfo.create record.Name diff --git a/WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs b/WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs index a188828..8ccb6de 100644 --- a/WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs +++ b/WoofWare.Myriad.Plugins/InterfaceMockGenerator.fs @@ -89,7 +89,7 @@ module internal InterfaceMockGenerator = [] else [ SynPat.unit ]) - (AstHelper.instantiateRecord constructorFields) + (SynExpr.createRecord None constructorFields) |> SynBinding.withXmlDoc (PreXmlDoc.create "An implementation where every method throws.") |> SynBinding.withReturnAnnotation constructorReturnType |> SynMemberDefn.staticMember diff --git a/WoofWare.Myriad.Plugins/JsonParseGenerator.fs b/WoofWare.Myriad.Plugins/JsonParseGenerator.fs index 6e3a57c..173c5f8 100644 --- a/WoofWare.Myriad.Plugins/JsonParseGenerator.fs +++ b/WoofWare.Myriad.Plugins/JsonParseGenerator.fs @@ -480,7 +480,7 @@ module internal JsonParseGenerator = let finalConstruction = fields |> List.mapi (fun i fieldData -> SynLongIdent.createI fieldData.Ident, SynExpr.createIdent $"arg_%i{i}") - |> AstHelper.instantiateRecord + |> SynExpr.createRecord None (finalConstruction, assignments) ||> List.fold (fun final assignment -> SynExpr.createLet [ assignment ] final) diff --git a/WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs b/WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs index 3ff25ab..5039a01 100644 --- a/WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs +++ b/WoofWare.Myriad.Plugins/RemoveOptionsGenerator.fs @@ -97,7 +97,7 @@ module internal RemoveOptionsGenerator = SynLongIdent.createI fieldData.Ident, body ) - |> AstHelper.instantiateRecord + |> SynExpr.createRecord None SynBinding.basic [ functionName ] diff --git a/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj b/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj index 06978b6..08db020 100644 --- a/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj +++ b/WoofWare.Myriad.Plugins/WoofWare.Myriad.Plugins.fsproj @@ -22,7 +22,7 @@ - + diff --git a/nix/deps.json b/nix/deps.json index 4aa6445..0dbecfe 100644 --- a/nix/deps.json +++ b/nix/deps.json @@ -21,8 +21,8 @@ }, { "pname": "FsCheck", - "version": "3.1.0", - "hash": "sha256-u0Ha94EjClJ8evNSHu8d6+Dx9qYM3kV3sl1PEq9gF8s=" + "version": "3.2.0", + "hash": "sha256-ksZ4vLgWwyQOzFuK2BczdtDtWWYmedG7UBAg4pYuI8g=" }, { "pname": "fsharp-analyzers", @@ -381,7 +381,7 @@ }, { "pname": "WoofWare.Whippet.Fantomas", - "version": "0.3.2", - "hash": "sha256-dhzp/ASz1dlROJAfLYRKOCRlmjLBoS00KYeWEkSVtMA=" + "version": "0.5.1", + "hash": "sha256-59CwnOZQAq5ZJoUkd87OiP8KUwx8xYDLMimMMTlKeZA=" } ]