Skip to content

Commit cc9a59c

Browse files
committed
Rebase and fix build issues in new functions
1 parent 4c35266 commit cc9a59c

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/FSharpLint.Core/Rules/Conventions/DisallowShadowing.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ let rec private processExpressions
3232
(processArgs: SynSimplePats -> bool)
3333
(expressions: list<SynExpr>) =
3434
match expressions with
35-
| SynExpr.LetOrUse(_, _, bindings, _, _, _) :: rest ->
35+
| SynExpr.LetOrUse(_, _, _, false, bindings, _, _, _) :: rest ->
3636
bindings |> List.exists processBinding
3737
|| processExpressions processBinding processArgs rest
3838
| SynExpr.Sequential(_, _, expr1, expr2, _, _) :: rest ->
@@ -65,7 +65,7 @@ let rec private processPatterns (definitionsAndPatterns: list<array<FSharpSymbol
6565
| (definitions, SynPat.Paren(pat, _)) :: rest ->
6666
processPatterns ((definitions, pat) :: rest)
6767
| (definitions, SynPat.Record(fieldPats, _)) :: rest ->
68-
processPatterns ((fieldPats |> List.map (fun (_, _, pat) -> (definitions, pat))) @ rest)
68+
processPatterns ((fieldPats |> List.map (fun patPairField -> (definitions, patPairField.Pattern))) @ rest)
6969
| (definitions, SynPat.Tuple(_, pats, _, _)) :: rest ->
7070
processPatterns ((pats |> List.map (fun pat -> (definitions, pat))) @ rest)
7171
| (definitions, SynPat.Typed(pat, _, _)) :: rest ->

src/FSharpLint.Core/Rules/Conventions/EnsureTailCallDiagnosticsInRecursiveFunctions.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ let runner (args: AstNodeRuleParams) =
4747
funcs
4848
|> List.choose (processFunction false checkInfo funcs)
4949
|> List.toArray
50-
| AstNode.Expression(SynExpr.LetOrUse(true, _, bindings, _, _, _)), Some checkInfo ->
50+
| AstNode.Expression(SynExpr.LetOrUse(true, _, _, false, bindings, _, _, _)), Some checkInfo ->
5151
match UnneededRecKeyword.getRecursiveFunctionsFromBindings bindings with
5252
| [] -> Array.empty
5353
| funcs ->

0 commit comments

Comments
 (0)