From 74fdd7c0a93b12ca6f3f0a50fea0086072ff781b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:35:58 +0000 Subject: [PATCH] Bump fantomas from 6.3.16 to 7.0.0 (#326) * Bump fantomas from 6.3.16 to 7.0.0 Bumps [fantomas](https://github.com/fsprojects/fantomas) from 6.3.16 to 7.0.0. - [Release notes](https://github.com/fsprojects/fantomas/releases) - [Changelog](https://github.com/fsprojects/fantomas/blob/main/CHANGELOG.md) - [Commits](https://github.com/fsprojects/fantomas/compare/v6.3.16...v7.0.0) --- updated-dependencies: - dependency-name: fantomas dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Deps * Format --------- 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> --- .config/dotnet-tools.json | 2 +- ConsumePlugin/Generated2SwaggerGitea.fs | 54 +++++++------------ ConsumePlugin/GeneratedRestClient.fs | 3 +- WoofWare.Myriad.Plugins/JsonParseGenerator.fs | 11 ++-- .../JsonSerializeGenerator.fs | 6 +-- nix/deps.json | 4 +- 6 files changed, 27 insertions(+), 53 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1cbedeb..fda17c5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "fantomas": { - "version": "6.3.16", + "version": "7.0.0", "commands": [ "fantomas" ] diff --git a/ConsumePlugin/Generated2SwaggerGitea.fs b/ConsumePlugin/Generated2SwaggerGitea.fs index 630b6c8..5c2fc5b 100644 --- a/ConsumePlugin/Generated2SwaggerGitea.fs +++ b/ConsumePlugin/Generated2SwaggerGitea.fs @@ -26769,8 +26769,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "admin/cron/{task}" - .Replace ("{task}", task.ToString () |> System.Uri.EscapeDataString), + "admin/cron/{task}".Replace ("{task}", task.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -26902,8 +26901,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "admin/hooks/{id}" - .Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), + "admin/hooks/{id}".Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -26945,8 +26943,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "admin/hooks/{id}" - .Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), + "admin/hooks/{id}".Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -27584,8 +27581,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "amdin/hooks/{id}" - .Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), + "amdin/hooks/{id}".Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -28008,8 +28004,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "org/{org}/repos" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), + "org/{org}/repos".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -28292,8 +28287,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - ("orgs/{org}/hooks" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + ("orgs/{org}/hooks".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + (if "orgs/{org}/hooks".IndexOf (char 63) >= 0 then "&" else @@ -28345,8 +28339,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "orgs/{org}/hooks" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), + "orgs/{org}/hooks".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -28538,8 +28531,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - ("orgs/{org}/labels" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + ("orgs/{org}/labels".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + (if "orgs/{org}/labels".IndexOf (char 63) >= 0 then "&" else @@ -28591,8 +28583,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "orgs/{org}/labels" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), + "orgs/{org}/labels".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -28784,8 +28775,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - ("orgs/{org}/members" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + ("orgs/{org}/members".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + (if "orgs/{org}/members".IndexOf (char 63) >= 0 then "&" else @@ -29086,8 +29076,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - ("orgs/{org}/repos" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + ("orgs/{org}/repos".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + (if "orgs/{org}/repos".IndexOf (char 63) >= 0 then "&" else @@ -29142,8 +29131,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "orgs/{org}/repos" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), + "orgs/{org}/repos".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -29197,8 +29185,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - ("orgs/{org}/teams" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + ("orgs/{org}/teams".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString) + (if "orgs/{org}/teams".IndexOf (char 63) >= 0 then "&" else @@ -29250,8 +29237,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "orgs/{org}/teams" - .Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), + "orgs/{org}/teams".Replace ("{org}", org.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -39381,8 +39367,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "repositories/{id}" - .Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), + "repositories/{id}".Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) @@ -39745,8 +39730,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - ("teams/{id}/members" - .Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString) + ("teams/{id}/members".Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString) + (if "teams/{id}/members".IndexOf (char 63) >= 0 then "&" else @@ -39918,8 +39902,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - ("teams/{id}/repos" - .Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString) + ("teams/{id}/repos".Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString) + (if "teams/{id}/repos".IndexOf (char 63) >= 0 then "&" else @@ -40807,8 +40790,7 @@ module Gitea = System.Uri ("/api/v1/", System.UriKind.Relative) ), System.Uri ( - "user/gpg_keys/{id}" - .Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), + "user/gpg_keys/{id}".Replace ("{id}", id.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) diff --git a/ConsumePlugin/GeneratedRestClient.fs b/ConsumePlugin/GeneratedRestClient.fs index 929f88a..d1408ad 100644 --- a/ConsumePlugin/GeneratedRestClient.fs +++ b/ConsumePlugin/GeneratedRestClient.fs @@ -160,8 +160,7 @@ module PureGymApi = | null -> System.Uri "https://whatnot.com/" | v -> v), System.Uri ( - "v1/gyms/{gym}" - .Replace ("{gym}", gym.ToString () |> System.Uri.EscapeDataString), + "v1/gyms/{gym}".Replace ("{gym}", gym.ToString () |> System.Uri.EscapeDataString), System.UriKind.Relative ) ) diff --git a/WoofWare.Myriad.Plugins/JsonParseGenerator.fs b/WoofWare.Myriad.Plugins/JsonParseGenerator.fs index a1ef700..6e3a57c 100644 --- a/WoofWare.Myriad.Plugins/JsonParseGenerator.fs +++ b/WoofWare.Myriad.Plugins/JsonParseGenerator.fs @@ -351,10 +351,7 @@ module internal JsonParseGenerator = let getParseOptions (fieldAttrs : SynAttribute list) = (JsonParseOption.None, fieldAttrs) ||> List.fold (fun options attr -> - if - (SynLongIdent.toString attr.TypeName) - .EndsWith ("JsonNumberHandling", StringComparison.Ordinal) - then + if (SynLongIdent.toString attr.TypeName).EndsWith ("JsonNumberHandling", StringComparison.Ordinal) then let qualifiedEnumValue = match SynExpr.stripOptionalParen attr.ArgExpr with | SynExpr.LongIdent (_, SynLongIdent (ident, _, _), _, _) when isJsonNumberHandling ident -> @@ -384,15 +381,13 @@ module internal JsonParseGenerator = let propertyNameAttr = fieldData.Attrs |> List.tryFind (fun attr -> - (SynLongIdent.toString attr.TypeName) - .EndsWith ("JsonPropertyName", StringComparison.Ordinal) + (SynLongIdent.toString attr.TypeName).EndsWith ("JsonPropertyName", StringComparison.Ordinal) ) let extensionDataAttr = fieldData.Attrs |> List.tryFind (fun attr -> - (SynLongIdent.toString attr.TypeName) - .EndsWith ("JsonExtensionData", StringComparison.Ordinal) + (SynLongIdent.toString attr.TypeName).EndsWith ("JsonExtensionData", StringComparison.Ordinal) ) let propertyName = diff --git a/WoofWare.Myriad.Plugins/JsonSerializeGenerator.fs b/WoofWare.Myriad.Plugins/JsonSerializeGenerator.fs index b2a0000..1689626 100644 --- a/WoofWare.Myriad.Plugins/JsonSerializeGenerator.fs +++ b/WoofWare.Myriad.Plugins/JsonSerializeGenerator.fs @@ -180,8 +180,7 @@ module internal JsonSerializeGenerator = let propertyNameAttr = attrs |> List.tryFind (fun attr -> - (SynLongIdent.toString attr.TypeName) - .EndsWith ("JsonPropertyName", StringComparison.Ordinal) + (SynLongIdent.toString attr.TypeName).EndsWith ("JsonPropertyName", StringComparison.Ordinal) ) match propertyNameAttr with @@ -198,8 +197,7 @@ module internal JsonSerializeGenerator = let getIsJsonExtension (attrs : SynAttribute list) : bool = attrs |> List.tryFind (fun attr -> - (SynLongIdent.toString attr.TypeName) - .EndsWith ("JsonExtensionData", StringComparison.Ordinal) + (SynLongIdent.toString attr.TypeName).EndsWith ("JsonExtensionData", StringComparison.Ordinal) ) |> Option.isSome diff --git a/nix/deps.json b/nix/deps.json index 2f96da0..d8cb3a5 100644 --- a/nix/deps.json +++ b/nix/deps.json @@ -6,8 +6,8 @@ }, { "pname": "fantomas", - "version": "6.3.16", - "hash": "sha256-4tRdYf+/Q1iedx+DDuIKVGlIWQdr6erM51VdKzZkhCs=" + "version": "7.0.0", + "hash": "sha256-v4bXmvjZOYxl5RSIHuqVfDzBQdRz5SrmzZtD6SeEYTY=" }, { "pname": "Fantomas.Core",