Updated FCS to .NET/F# 9.0

fable-compiler · Nov 16, 2024 · f3e48c5 · f3e48c5
1 parent ae39fa1
commit f3e48c5
Show file tree

Hide file tree

Showing 10 changed files with 5,080 additions and 2,580 deletions.
diff --git a/lib/fcs/FSharp.Compiler.Service.deps.json b/lib/fcs/FSharp.Compiler.Service.deps.json
diff --git a/lib/fcs/FSharp.Compiler.Service.dll b/lib/fcs/FSharp.Compiler.Service.dll
diff --git a/lib/fcs/FSharp.Compiler.Service.xml b/lib/fcs/FSharp.Compiler.Service.xml
diff --git a/lib/fcs/FSharp.Core.dll b/lib/fcs/FSharp.Core.dll
diff --git a/lib/fcs/FSharp.Core.xml b/lib/fcs/FSharp.Core.xml
diff --git a/lib/fcs/FSharp.DependencyManager.Nuget.dll b/lib/fcs/FSharp.DependencyManager.Nuget.dll
diff --git a/lib/fcs/FSharp.DependencyManager.Nuget.xml b/lib/fcs/FSharp.DependencyManager.Nuget.xml
diff --git a/src/Fable.Cli/Main.fs b/src/Fable.Cli/Main.fs
@@ -1192,16 +1192,17 @@ let private compilationCycle (state: State) (changes: ISet<string>) =
 
                             Log.always ("Generating assembly...")
 
-                            let! (diagnostics, exitCode), ms =
+                            let! (diagnostics, result), ms =
                                 Performance.measureAsync <| fun _ -> fableCompiler.CompileToFile(dllPath)
 
                             Log.always ($"Assembly generated in {ms}ms")
 
-                            if exitCode <> 0 then
+                            match result with
+                            | Some ex ->
                                 getFSharpDiagnostics diagnostics |> logErrors cliArgs.RootDir
-
-                                return exitCode
-                            else
+                                Log.error (ex.Message)
+                                return 1
+                            | None ->
                                 Log.always ($"Saving precompiled info...")
                                 let! fableProj = fableCompiler.GetFableProject()
 

diff --git a/src/Fable.Transforms/Rust/Replacements.fs b/src/Fable.Transforms/Rust/Replacements.fs
@@ -342,6 +342,8 @@ let emitFormat (com: ICompiler) r t (args: Expr list) macro =
         | [ StringTempl(fmt, args); Value(NewArray(ArrayValues restArgs, _, _), _) ] ->
             (emitRawString fmt) :: args @ restArgs
         | (StringTempl(fmt, args)) :: restArgs -> (emitRawString fmt) :: args @ restArgs
+        | [ ExprTypeAs(String, str); Value(NewArray(ArrayValues restArgs, _, _), _) ] ->
+            (emitRawString "{0}") :: str :: restArgs
         | _ -> (emitRawString "{0}") :: args
 
     let unboxedArgs = args |> FSharp2Fable.Util.unboxBoxedArgs

diff --git a/src/fcs-fable/src/Compiler/Service/FSharpSource.fsi b/src/fcs-fable/src/Compiler/Service/FSharpSource.fsi
@@ -28,7 +28,7 @@ type internal FSharpSource =
     abstract TimeStamp: DateTime
 
     /// Gets the internal text container. Text may be on-disk, in a stream, or a source text.
-    abstract internal GetTextContainer: unit -> Async<TextContainer>
+    abstract GetTextContainer: unit -> Async<TextContainer>
 
 #if !FABLE_COMPILER
     /// Creates a FSharpSource from disk. Only used internally.