Skip to content

Commit 6684413

Browse files
safesparrowsafesparrow
committed
Fix build
1 parent b857487 commit 6684413

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎src/Compiler/Checking/CheckDeclarations.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5178,7 +5178,7 @@ let CheckOneImplFile
51785178

51795179
cancellable {
51805180
use _ =
5181-
Activity.Start "CheckDeclarations.CheckOneImplFile"
5181+
Activity.start "CheckDeclarations.CheckOneImplFile"
51825182
[|
51835183
"fileName", fileName
51845184
"qualifiedNameOfFile", qualNameOfFile.Text
@@ -5311,7 +5311,7 @@ let CheckOneImplFile
53115311
let CheckOneSigFile (g, amap, thisCcu, checkForErrors, conditionalDefines, tcSink, isInternalTestSpanStackReferring) tcEnv (sigFile: ParsedSigFileInput) =
53125312
cancellable {
53135313
use _ =
5314-
Activity.Start "CheckDeclarations.CheckOneSigFile"
5314+
Activity.start "CheckDeclarations.CheckOneSigFile"
53155315
[|
53165316
"fileName", sigFile.FileName
53175317
"qualifiedNameOfFile", sigFile.QualifiedName.Text

‎src/Compiler/Driver/ParseAndCheckInputs.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,7 @@ let CheckOneInputAux
11991199
cancellable {
12001200
try
12011201
use _ =
1202-
Activity.Start "ParseAndCheckInputs.CheckOneInput" [| "fileName", inp.FileName |]
1202+
Activity.start "ParseAndCheckInputs.CheckOneInput" [| "fileName", inp.FileName |]
12031203

12041204
CheckSimulateException tcConfig
12051205

‎src/Compiler/Service/FSharpCheckerResults.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2331,7 +2331,7 @@ module internal ParseAndCheckFile =
23312331

23322332
let parseFile (sourceText: ISourceText, fileName, options: FSharpParsingOptions, userOpName: string, suggestNamesForErrors: bool) =
23332333
Trace.TraceInformation("FCS: {0}.{1} ({2})", userOpName, "parseFile", fileName)
2334-
use act = Activity.Start "ParseAndCheckFile.parseFile" [| "fileName", fileName |]
2334+
use act = Activity.start "ParseAndCheckFile.parseFile" [| "fileName", fileName |]
23352335

23362336
let errHandler =
23372337
DiagnosticsHandler(true, fileName, options.DiagnosticOptions, sourceText, suggestNamesForErrors)
@@ -2488,7 +2488,7 @@ module internal ParseAndCheckFile =
24882488

24892489
cancellable {
24902490
use _ =
2491-
Activity.Start
2491+
Activity.start
24922492
"ParseAndCheckFile.CheckOneFile"
24932493
[|
24942494
"fileName", mainInputFileName

‎src/Compiler/Service/IncrementalBuild.fs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ module IncrementalBuildSyntaxTree =
125125
IncrementalBuilderEventTesting.MRU.Add(IncrementalBuilderEventTesting.IBEParsed fileName)
126126
let canSkip = sigNameOpt.IsSome && FSharpImplFileSuffixes |> List.exists (FileSystemUtils.checkSuffix fileName)
127127
use act =
128-
Activity.Start "IncrementalBuildSyntaxTree.parse"
128+
Activity.start "IncrementalBuildSyntaxTree.parse"
129129
[|
130130
"fileName", source.FilePath
131131
"buildPhase", BuildPhase.Parse.ToString()
@@ -473,7 +473,7 @@ type BoundModel private (tcConfig: TcConfig,
473473
let! res = defaultTypeCheck ()
474474
return res
475475
| Some syntaxTree ->
476-
use _ = Activity.Start "BoundModel.TypeCheck" [|"fileName", syntaxTree.FileName|]
476+
use _ = Activity.start "BoundModel.TypeCheck" [|"fileName", syntaxTree.FileName|]
477477
let sigNameOpt =
478478
if partialCheck then
479479
this.BackingSignature
@@ -536,7 +536,7 @@ type BoundModel private (tcConfig: TcConfig,
536536
// Build symbol keys
537537
let itemKeyStore, semanticClassification =
538538
if enableBackgroundItemKeyStoreAndSemanticClassification then
539-
use _ = Activity.Start "IncrementalBuild.CreateItemKeyStoreAndSemanticClassification" [|"fileName", fileName|]
539+
use _ = Activity.start "IncrementalBuild.CreateItemKeyStoreAndSemanticClassification" [|"fileName", fileName|]
540540
let sResolutions = sink.GetResolutions()
541541
let builder = ItemKeyStoreBuilder()
542542
let preventDuplicates = HashSet({ new IEqualityComparer<struct(pos * pos)> with
@@ -1041,7 +1041,7 @@ module IncrementalBuilderStateHelpers =
10411041

10421042
let rec createFinalizeBoundModelGraphNode (initialState: IncrementalBuilderInitialState) (boundModels: ImmutableArray<GraphNode<BoundModel>>.Builder) =
10431043
GraphNode(node {
1044-
use _ = Activity.Start "GetCheckResultsAndImplementationsForProject" [|"projectOutFile", initialState.outfile|]
1044+
use _ = Activity.start "GetCheckResultsAndImplementationsForProject" [|"projectOutFile", initialState.outfile|]
10451045
// Compute last bound model then get all the evaluated models.
10461046
let! _ = boundModels[boundModels.Count - 1].GetOrComputeValue()
10471047
let boundModels =

‎src/Compiler/Service/service.fs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ type BackgroundCompiler
275275
let CreateOneIncrementalBuilder (options: FSharpProjectOptions, userOpName) =
276276
node {
277277
use _ =
278-
Activity.Start "BackgroundCompiler.CreateOneIncrementalBuilder" [| "project", options.ProjectFileName |]
278+
Activity.start "BackgroundCompiler.CreateOneIncrementalBuilder" [| "project", options.ProjectFileName |]
279279

280280
Trace.TraceInformation("FCS: {0}.{1} ({2})", userOpName, "CreateOneIncrementalBuilder", options.ProjectFileName)
281281
let projectReferences = getProjectReferences options userOpName
@@ -467,7 +467,7 @@ type BackgroundCompiler
467467
member _.ParseFile(fileName: string, sourceText: ISourceText, options: FSharpParsingOptions, cache: bool, userOpName: string) =
468468
async {
469469
use _ =
470-
Activity.Start "BackgroundCompiler.ParseFile" [| "fileName", fileName; "userOpName", userOpName; "cache", cache.ToString() |]
470+
Activity.start "BackgroundCompiler.ParseFile" [| "fileName", fileName; "userOpName", userOpName; "cache", cache.ToString() |]
471471

472472
if cache then
473473
let hash = sourceText.GetHashCode() |> int64
@@ -494,7 +494,7 @@ type BackgroundCompiler
494494
member _.GetBackgroundParseResultsForFileInProject(fileName, options, userOpName) =
495495
node {
496496
use _ =
497-
Activity.Start "BackgroundCompiler.GetBackgroundParseResultsForFileInProject" [| "fileName", fileName; "userOpName", userOpName |]
497+
Activity.start "BackgroundCompiler.GetBackgroundParseResultsForFileInProject" [| "fileName", fileName; "userOpName", userOpName |]
498498

499499
let! builderOpt, creationDiags = getOrCreateBuilder (options, userOpName)
500500

@@ -523,7 +523,7 @@ type BackgroundCompiler
523523

524524
member _.GetCachedCheckFileResult(builder: IncrementalBuilder, fileName, sourceText: ISourceText, options) =
525525
node {
526-
use _ = Activity.Start "BackgroundCompiler.GetCachedCheckFileResult" [| "fileName", fileName |]
526+
use _ = Activity.start "BackgroundCompiler.GetCachedCheckFileResult" [| "fileName", fileName |]
527527
let hash = sourceText.GetHashCode() |> int64
528528
let key = (fileName, hash, options)
529529
let cachedResultsOpt = parseCacheLock.AcquireLock(fun ltok -> checkFileInProjectCache.TryGet(ltok, key))
@@ -627,7 +627,7 @@ type BackgroundCompiler
627627
) =
628628
node {
629629
use _ =
630-
Activity.Start
630+
Activity.start
631631
"BackgroundCompiler.CheckFileInProjectAllowingStaleCachedResults"
632632
[|
633633
"project", options.ProjectFileName
@@ -669,7 +669,7 @@ type BackgroundCompiler
669669
member bc.CheckFileInProject(parseResults: FSharpParseFileResults, fileName, fileVersion, sourceText: ISourceText, options, userOpName) =
670670
node {
671671
use _ =
672-
Activity.Start
672+
Activity.start
673673
"BackgroundCompiler.CheckFileInProject"
674674
[|
675675
"project", options.ProjectFileName
@@ -697,7 +697,7 @@ type BackgroundCompiler
697697
member bc.ParseAndCheckFileInProject(fileName: string, fileVersion, sourceText: ISourceText, options: FSharpProjectOptions, userOpName) =
698698
node {
699699
use _ =
700-
Activity.Start
700+
Activity.start
701701
"BackgroundCompiler.ParseAndCheckFileInProject"
702702
[|
703703
"project", options.ProjectFileName
@@ -743,7 +743,7 @@ type BackgroundCompiler
743743
member _.GetBackgroundCheckResultsForFileInProject(fileName, options, userOpName) =
744744
node {
745745
use _ =
746-
Activity.Start
746+
Activity.start
747747
"BackgroundCompiler.ParseAndCheckFileInProject"
748748
[|
749749
"project", options.ProjectFileName
@@ -835,7 +835,7 @@ type BackgroundCompiler
835835
) =
836836
node {
837837
use _ =
838-
Activity.Start
838+
Activity.start
839839
"BackgroundCompiler.FindReferencesInFile"
840840
[|
841841
"project", options.ProjectFileName
@@ -863,7 +863,7 @@ type BackgroundCompiler
863863
member _.GetSemanticClassificationForFile(fileName: string, options: FSharpProjectOptions, userOpName: string) =
864864
node {
865865
use _ =
866-
Activity.Start
866+
Activity.start
867867
"BackgroundCompiler.GetSemanticClassificationForFile"
868868
[|
869869
"project", options.ProjectFileName
@@ -887,7 +887,7 @@ type BackgroundCompiler
887887
/// Try to get recent approximate type check results for a file.
888888
member _.TryGetRecentCheckResultsForFile(fileName: string, options: FSharpProjectOptions, sourceText: ISourceText option, _userOpName: string) =
889889
use _ =
890-
Activity.Start
890+
Activity.start
891891
"BackgroundCompiler.GetSemanticClassificationForFile"
892892
[|
893893
"project", options.ProjectFileName
@@ -968,7 +968,7 @@ type BackgroundCompiler
968968
member _.GetAssemblyData(options, userOpName) =
969969
node {
970970
use _ =
971-
Activity.Start "BackgroundCompiler.GetAssemblyData" [| "project", options.ProjectFileName; "userOpName", userOpName |]
971+
Activity.start "BackgroundCompiler.GetAssemblyData" [| "project", options.ProjectFileName; "userOpName", userOpName |]
972972

973973
let! builderOpt, _ = getOrCreateBuilder (options, userOpName)
974974

@@ -991,7 +991,7 @@ type BackgroundCompiler
991991
/// Parse and typecheck the whole project.
992992
member bc.ParseAndCheckProject(options, userOpName) =
993993
use _ =
994-
Activity.Start "BackgroundCompiler.ParseAndCheckProject" [| "project", options.ProjectFileName; "userOpName", userOpName |]
994+
Activity.start "BackgroundCompiler.ParseAndCheckProject" [| "project", options.ProjectFileName; "userOpName", userOpName |]
995995

996996
bc.ParseAndCheckProjectImpl(options, userOpName)
997997

@@ -1010,7 +1010,7 @@ type BackgroundCompiler
10101010
_userOpName
10111011
) =
10121012
use _ =
1013-
Activity.Start "BackgroundCompiler.GetProjectOptionsFromScript" [| "fileName", fileName; "userOpName", _userOpName |]
1013+
Activity.start "BackgroundCompiler.GetProjectOptionsFromScript" [| "fileName", fileName; "userOpName", _userOpName |]
10141014

10151015
cancellable {
10161016
use diagnostics = new DiagnosticsScope()
@@ -1097,7 +1097,7 @@ type BackgroundCompiler
10971097

10981098
member bc.InvalidateConfiguration(options: FSharpProjectOptions, userOpName) =
10991099
use _ =
1100-
Activity.Start "BackgroundCompiler.InvalidateConfiguration" [| "project", options.ProjectFileName; "userOpName", userOpName |]
1100+
Activity.start "BackgroundCompiler.InvalidateConfiguration" [| "project", options.ProjectFileName; "userOpName", userOpName |]
11011101

11021102
if incrementalBuildersCache.ContainsSimilarKey(AnyCallerThread, options) then
11031103
parseCacheLock.AcquireLock(fun ltok ->
@@ -1108,15 +1108,15 @@ type BackgroundCompiler
11081108
()
11091109

11101110
member bc.ClearCache(options: seq<FSharpProjectOptions>, _userOpName) =
1111-
use _ = Activity.Start "BackgroundCompiler.ClearCache" [| "userOpName", _userOpName |]
1111+
use _ = Activity.start "BackgroundCompiler.ClearCache" [| "userOpName", _userOpName |]
11121112

11131113
lock gate (fun () ->
11141114
options
11151115
|> Seq.iter (fun options -> incrementalBuildersCache.RemoveAnySimilar(AnyCallerThread, options)))
11161116

11171117
member _.NotifyProjectCleaned(options: FSharpProjectOptions, userOpName) =
11181118
use _ =
1119-
Activity.Start "BackgroundCompiler.NotifyProjectCleaned" [| "project", options.ProjectFileName; "userOpName", userOpName |]
1119+
Activity.start "BackgroundCompiler.NotifyProjectCleaned" [| "project", options.ProjectFileName; "userOpName", userOpName |]
11201120

11211121
async {
11221122
let! ct = Async.CancellationToken
@@ -1284,7 +1284,7 @@ type FSharpChecker
12841284

12851285
member _.MatchBraces(fileName, sourceText: ISourceText, options: FSharpParsingOptions, ?userOpName: string) =
12861286
let userOpName = defaultArg userOpName "Unknown"
1287-
use _ = Activity.Start "FSharpChecker.MatchBraces" [| "fileName", fileName; "userOpName", userOpName |]
1287+
use _ = Activity.start "FSharpChecker.MatchBraces" [| "fileName", fileName; "userOpName", userOpName |]
12881288
let hash = sourceText.GetHashCode() |> int64
12891289

12901290
async {
@@ -1336,7 +1336,7 @@ type FSharpChecker
13361336

13371337
member _.Compile(argv: string[], ?userOpName: string) =
13381338
let _userOpName = defaultArg userOpName "Unknown"
1339-
use _ = Activity.Start "FSharpChecker.Compile" [| "userOpName", _userOpName |]
1339+
use _ = Activity.start "FSharpChecker.Compile" [| "userOpName", _userOpName |]
13401340

13411341
async {
13421342
let ctok = CompilationThreadToken()

0 commit comments

Comments
 (0)