Skip to content

Commit c6cee41

Browse files
committed
Merge remote-tracking branch 'fable-compiler/main'
2 parents 417c2b3 + 1cc7df5 commit c6cee41

File tree

37 files changed

+646
-172
lines changed

37 files changed

+646
-172
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"fantomas": {
12-
"version": "6.3.16",
12+
"version": "7.0.0",
1313
"commands": [
1414
"fantomas"
1515
]

lib/fcs/FSharp.Compiler.Service.dll

512 Bytes
Binary file not shown.

lib/fcs/FSharp.Compiler.Service.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32571,6 +32571,11 @@ Get the signature for the value's XML documentation
3257132571
Indicates a constraint that a type is a reference type
3257232572
</summary>
3257332573
</member>
32574+
<member name="P:FSharp.Compiler.Symbols.FSharpGenericParameterConstraint.IsNotSupportsNullConstraint">
32575+
<summary>
32576+
Indicates a constraint that a type doesn&apos;t support nullness
32577+
</summary>
32578+
</member>
3257432579
<member name="P:FSharp.Compiler.Symbols.FSharpGenericParameterConstraint.IsNonNullableValueTypeConstraint">
3257532580
<summary>
3257632581
Indicates a constraint that a type is a non-Nullable value type
@@ -32611,6 +32616,11 @@ Get the signature for the value&apos;s XML documentation
3261132616
Indicates a constraint that a type is a subtype of the given type
3261232617
</summary>
3261332618
</member>
32619+
<member name="P:FSharp.Compiler.Symbols.FSharpGenericParameterConstraint.IsAllowsRefStructConstraint">
32620+
<summary>
32621+
An anti-constraint indicating that ref structs (e.g. Span&lt;&gt;) are allowed here
32622+
</summary>
32623+
</member>
3261432624
<member name="P:FSharp.Compiler.Symbols.FSharpGenericParameterConstraint.EnumConstraintTarget">
3261532625
<summary>
3261632626
Gets further information about an enumeration constraint

lib/fcs/FSharp.Core.dll

0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

src/Fable.AST/Fable.fs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,17 @@ type Constraint =
8383
| HasMember of name: string * isStatic: bool
8484
| CoercesTo of target: Type
8585
| IsNullable
86+
| IsNotNullable
8687
| IsValueType
8788
| IsReferenceType
8889
| HasDefaultConstructor
90+
| HasAllowsRefStruct
8991
| HasComparison
9092
| HasEquality
9193
| IsUnmanaged
92-
| IsEnum
94+
| IsDelegate of argsType: Type * retType: Type
95+
| IsEnum of baseType: Type
96+
| SimpleChoice of types: Type list
9397

9498
type GenericParam =
9599
abstract Name: string

src/Fable.Cli/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
* [All] Updated FCS to latest F# 9.0 (by @ncave)
1515
* [All] Updated Fable-FCS to latest F# 9.0 (by @ncave)
1616
* [All] Updated metadata to latest .NET 9.0 (by @ncave)
17+
* [All] Updated FCS type constraints (by @ncave)
18+
19+
### Fixed
20+
21+
* [Py] Add missing unicode categories in python library (by @joprice)
1722

1823
## 5.0.0-alpha.5 - 2025-01-09
1924

src/Fable.Cli/Entry.fs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,9 +504,7 @@ let main argv =
504504
let createLogger level =
505505
use factory =
506506
LoggerFactory.Create(fun builder ->
507-
builder
508-
.SetMinimumLevel(level)
509-
.AddCustomConsole(fun options -> options.UseNoPrefixMsgStyle <- true)
507+
builder.SetMinimumLevel(level).AddCustomConsole(fun options -> options.UseNoPrefixMsgStyle <- true)
510508
|> ignore
511509
)
512510

src/Fable.Cli/Pipeline.fs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,7 @@ module Js =
175175
// I believe for now we can ship it like that because it only deteriorate the source map
176176
// it should not break them completely.
177177
if srcLine <> 0 && srcCol <> 0 && file <> Some "unknown" then
178-
mapGenerator
179-
.Force()
180-
.AddMapping(generated, original, source = sourcePath, ?name = displayName)
178+
mapGenerator.Force().AddMapping(generated, original, source = sourcePath, ?name = displayName)
181179

182180
let compileFile (com: Compiler) (cliArgs: CliArgs) pathResolver isSilent (outPath: string) =
183181
async {

src/Fable.Compiler/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414
* [All] Updated FCS to latest F# 9.0 (by @ncave)
1515
* [All] Updated Fable-FCS to latest F# 9.0 (by @ncave)
1616
* [All] Updated metadata to latest .NET 9.0 (by @ncave)
17+
* [All] Updated FCS type constraints (by @ncave)
18+
19+
### Fixed
20+
21+
* [Py] Add missing unicode categories in python library (by @joprice)
1722

1823
## 5.0.0-alpha.5 - 2025-01-09
1924

0 commit comments

Comments
 (0)