Merge pull request #2923 from dawedawe/silence_preview_warnings

Brace yourself, warnings are coming
fsprojects · Jul 12, 2023 · 41fe8d6 · 41fe8d6
2 parents 21bda5b + 4817adc
commit 41fe8d6
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 22 deletions.
diff --git a/src/Fantomas.Client/LSPFantomasService.fs b/src/Fantomas.Client/LSPFantomasService.fs
@@ -61,9 +61,8 @@ let private createAgent (ct: CancellationToken) =
                                         | Ok newDaemon ->
                                             replyChannel.Reply(Ok newDaemon.RpcClient)
 
-                                            { state with
-                                                FolderToVersion = Map.add folder version state.FolderToVersion
-                                                Daemons = Map.add version newDaemon state.Daemons }
+                                            { FolderToVersion = Map.add folder version state.FolderToVersion
+                                              Daemons = Map.add version newDaemon state.Daemons }
                                         | Error pse ->
                                             replyChannel.Reply(Error(GetDaemonError.FantomasProcessStart pse))
                                             state
@@ -94,9 +93,8 @@ let private createAgent (ct: CancellationToken) =
                                     | Ok daemon ->
                                         replyChannel.Reply(Ok daemon.RpcClient)
 
-                                        { state with
-                                            Daemons = Map.add version daemon state.Daemons
-                                            FolderToVersion = Map.add folder version state.FolderToVersion }
+                                        { Daemons = Map.add version daemon state.Daemons
+                                          FolderToVersion = Map.add folder version state.FolderToVersion }
                                     | Error pse ->
                                         replyChannel.Reply(Error(GetDaemonError.FantomasProcessStart pse))
                                         state

diff --git a/src/Fantomas.Core/ASTTransformer.fs b/src/Fantomas.Core/ASTTransformer.fs
@@ -607,7 +607,7 @@ let mkLinksFromSynLongIdent (sli: SynLongIdent) : LinkExpr list =
 
 let (|UnitExpr|_|) e =
     match e with
-    | SynExpr.Const(constant = SynConst.Unit _) -> Some e.Range
+    | SynExpr.Const(constant = SynConst.Unit) -> Some e.Range
     | _ -> None
 
 let (|ParenExpr|_|) e =
@@ -2384,7 +2384,7 @@ let mkTypeDefn
                 | SynTypeDefnLeadingKeyword.Type mType -> stn "type" mType
                 | SynTypeDefnLeadingKeyword.And mAnd -> stn "and" mAnd
                 | SynTypeDefnLeadingKeyword.StaticType _
-                | SynTypeDefnLeadingKeyword.Synthetic _ -> failwithf "unexpected %A" trivia.LeadingKeyword
+                | SynTypeDefnLeadingKeyword.Synthetic -> failwithf "unexpected %A" trivia.LeadingKeyword
 
             let implicitConstructorNode =
                 match implicitConstructor with
@@ -3131,7 +3131,7 @@ let mkTypeDefnSig (creationAide: CreationAide) (SynTypeDefnSig(typeInfo, typeRep
                 | SynTypeDefnLeadingKeyword.Type mType -> stn "type" mType
                 | SynTypeDefnLeadingKeyword.And mAnd -> stn "and" mAnd
                 | SynTypeDefnLeadingKeyword.StaticType _
-                | SynTypeDefnLeadingKeyword.Synthetic _ -> failwithf "unexpected %A" trivia.LeadingKeyword
+                | SynTypeDefnLeadingKeyword.Synthetic -> failwithf "unexpected %A" trivia.LeadingKeyword
 
             let m =
                 if not px.IsEmpty then

diff --git a/src/Fantomas.Core/CodePrinter.fs b/src/Fantomas.Core/CodePrinter.fs
@@ -159,7 +159,7 @@ let genIdentListNodeAux addLeadingDot (iln: IdentListNode) =
             else
                 genSingleTextNode ident +> sepNlnWhenWriteBeforeNewlineNotEmpty
         | IdentifierOrDot.KnownDot dot -> genSingleTextNode dot
-        | IdentifierOrDot.UnknownDot _ -> sepDot)
+        | IdentifierOrDot.UnknownDot -> sepDot)
     |> genNode iln
 
 let genIdentListNode iln = genIdentListNodeAux false iln
@@ -2220,12 +2220,12 @@ let genFunctionNameWithMultilineLids (trailing: Context -> Context) (longIdent:
                 (function
                 | IdentifierOrDot.Ident _ -> sepNone
                 | IdentifierOrDot.KnownDot _
-                | IdentifierOrDot.UnknownDot _ -> sepNln)
+                | IdentifierOrDot.UnknownDot -> sepNln)
                 t
                 (function
                  | IdentifierOrDot.Ident identNode -> genSingleTextNode identNode
                  | IdentifierOrDot.KnownDot dot -> genSingleTextNode dot
-                 | IdentifierOrDot.UnknownDot _ -> sepDot)
+                 | IdentifierOrDot.UnknownDot -> sepDot)
             +> trailing
         )
     | _ -> sepNone

diff --git a/src/Fantomas.Core/Context.fs b/src/Fantomas.Core/Context.fs
@@ -367,7 +367,7 @@ let newlineBetweenLastWriteEvent ctx =
         | RestoreAtColumn _ -> true
         | _ -> false)
     |> Seq.filter (function
-        | WriteLine _ -> true
+        | WriteLine -> true
         | _ -> false)
     |> Seq.length
     |> fun writeLines -> writeLines > 1
@@ -674,7 +674,7 @@ let leadingExpressionIsMultiline leadingExpression continuationExpression (ctx:
         |> Queue.skipExists
             eventCountBeforeExpression
             (function
-            | WriteLine _ -> true
+            | WriteLine -> true
             | _ -> false)
             (fun e ->
                 match e with
@@ -1052,9 +1052,8 @@ let colWithNlnWhenItemIsMultiline (items: ColMultilineItem list) (ctx: Context)
                             nextCtx
 
                     loop
-                        { acc with
-                            Context = nextCtx
-                            LastBlockMultiline = isMultiline }
+                        { Context = nextCtx
+                          LastBlockMultiline = isMultiline }
                         rest
 
             loop itemsState items

diff --git a/src/Fantomas.Core/Trivia.fs b/src/Fantomas.Core/Trivia.fs
@@ -310,7 +310,7 @@ let addToTree (tree: Oak) (trivia: TriviaNode seq) =
             | Newline
             | Directive _ -> simpleTriviaToTriviaInstruction parentNode trivia
             | BlockComment _
-            | Cursor _ -> blockCommentToTriviaInstruction parentNode trivia
+            | Cursor -> blockCommentToTriviaInstruction parentNode trivia
 
 let enrichTree (config: FormatConfig) (sourceText: ISourceText) (ast: ParsedInput) (tree: Oak) : Oak =
     let fullTreeRange = tree.Range

diff --git a/src/Fantomas.FCS/Parse.fs b/src/Fantomas.FCS/Parse.fs
@@ -655,7 +655,7 @@ let getSyntaxErrorMessage ctxt =
         | Parser.TOKEN_BAR_RBRACK -> getErrorString "Parser.TOKEN.BAR.RBRACK"
         | Parser.TOKEN_BAR_RBRACE -> getErrorString "Parser.TOKEN.BAR.RBRACE"
         | Parser.TOKEN_GREATER_RBRACK -> getErrorString "Parser.TOKEN.GREATER.RBRACK"
-        | Parser.TOKEN_RQUOTE_DOT _
+        | Parser.TOKEN_RQUOTE_DOT
         | Parser.TOKEN_RQUOTE -> getErrorString "Parser.TOKEN.RQUOTE"
         | Parser.TOKEN_RBRACK -> getErrorString "Parser.TOKEN.RBRACK"
         | Parser.TOKEN_RBRACE
@@ -682,8 +682,8 @@ let getSyntaxErrorMessage ctxt =
         | Parser.TOKEN_OTHEN -> getErrorString "Parser.TOKEN.OTHEN"
         | Parser.TOKEN_ELSE
         | Parser.TOKEN_OELSE -> getErrorString "Parser.TOKEN.OELSE"
-        | Parser.TOKEN_LET _
-        | Parser.TOKEN_OLET _ -> getErrorString "Parser.TOKEN.OLET"
+        | Parser.TOKEN_LET
+        | Parser.TOKEN_OLET -> getErrorString "Parser.TOKEN.OLET"
         | Parser.TOKEN_OBINDER
         | Parser.TOKEN_BINDER -> getErrorString "Parser.TOKEN.BINDER"
         | Parser.TOKEN_OAND_BANG

diff --git a/src/Fantomas/Program.fs b/src/Fantomas/Program.fs
@@ -183,7 +183,7 @@ let runCheckCommand (inputPath: InputPath) : int =
     | InputPath.NotFound s ->
         elog $"Input path '%s{s}' not found"
         1
-    | InputPath.Unspecified _ ->
+    | InputPath.Unspecified ->
         elog "No input path provided. Call with --help for usage information."
         1
     | InputPath.File f when (IgnoreFile.isIgnoredFile (IgnoreFile.current.Force()) f) ->