Skip to content

Commit

Permalink
Merge pull request #7761 from dotnet/merges/master-to-feature/tasks
Browse files Browse the repository at this point in the history
Merge master to feature/tasks
  • Loading branch information
brettfo authored Oct 22, 2019
2 parents 5dbd1db + c18e178 commit bc5535d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
3 changes: 0 additions & 3 deletions src/fsharp/CompileOps.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2009,7 +2009,6 @@ type CcuLoadFailureAction =
[<NoEquality; NoComparison>]
type TcConfigBuilder =
{ mutable primaryAssembly: PrimaryAssembly
mutable autoResolveOpenDirectivesToDlls: bool
mutable noFeedback: bool
mutable stackReserveSize: int32 option
mutable implicitIncludeDir: string (* normally "." *)
Expand Down Expand Up @@ -2176,7 +2175,6 @@ type TcConfigBuilder =
stackReserveSize = None
conditionalCompilationDefines = []
implicitIncludeDir = String.Empty
autoResolveOpenDirectivesToDlls = false
openDebugInformationForLaterStaticLinking = false
defaultFSharpBinariesDir = String.Empty
compilingFslib = false
Expand Down Expand Up @@ -2619,7 +2617,6 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
let systemAssemblies = systemAssemblies

member x.primaryAssembly = data.primaryAssembly
member x.autoResolveOpenDirectivesToDlls = data.autoResolveOpenDirectivesToDlls
member x.noFeedback = data.noFeedback
member x.stackReserveSize = data.stackReserveSize
member x.implicitIncludeDir = data.implicitIncludeDir
Expand Down
2 changes: 0 additions & 2 deletions src/fsharp/CompileOps.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,6 @@ type VersionFlag =
[<NoEquality; NoComparison>]
type TcConfigBuilder =
{ mutable primaryAssembly: PrimaryAssembly
mutable autoResolveOpenDirectivesToDlls: bool
mutable noFeedback: bool
mutable stackReserveSize: int32 option
mutable implicitIncludeDir: string
Expand Down Expand Up @@ -417,7 +416,6 @@ type TcConfigBuilder =
// Immutable TcConfig
type TcConfig =
member primaryAssembly: PrimaryAssembly
member autoResolveOpenDirectivesToDlls: bool
member noFeedback: bool
member stackReserveSize: int32 option
member implicitIncludeDir: string
Expand Down

0 comments on commit bc5535d

Please sign in to comment.