From 710937b60fe3381464d1ef11f6704986872451e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9=20Larivi=C3=A8re?= Date: Wed, 6 Mar 2019 10:29:14 +0100 Subject: [PATCH 1/2] Fix types --- src/Fabulous.LiveUpdate/LiveUpdate.fs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Fabulous.LiveUpdate/LiveUpdate.fs b/src/Fabulous.LiveUpdate/LiveUpdate.fs index beeb1b04a..340daec0c 100644 --- a/src/Fabulous.LiveUpdate/LiveUpdate.fs +++ b/src/Fabulous.LiveUpdate/LiveUpdate.fs @@ -145,7 +145,7 @@ type HttpServer(?port) = if (path = "/update") then let reader = new StreamReader (c.Request.InputStream, Encoding.UTF8) let! requestText = reader.ReadToEndAsync () |> Async.AwaitTask - let req = Newtonsoft.Json.JsonConvert.DeserializeObject(requestText) + let req = Newtonsoft.Json.JsonConvert.DeserializeObject<(string * DFile)[]>(requestText) //let req = serializer.UnPickleOfString(requestText) let resp = switchD req return Newtonsoft.Json.JsonConvert.SerializeObject resp @@ -211,15 +211,15 @@ module Extensions = let interp = EvalContext(System.Reflection.Assembly.Load) - let switchD (files: DFile[]) = + let switchD (files: (string * DFile)[]) = lock interp (fun () -> let res = try - for file in files do + for (fileName, file) in files do printfn "LiveUpdate: adding declarations...." interp.AddDecls file.Code - for file in files do + for (fileName, file) in files do printfn "LiveUpdate: evaluating decls in code package for side effects...." interp.EvalDecls (envEmpty, file.Code) Result.Ok () @@ -239,7 +239,7 @@ module Extensions = | 0 -> { Quacked = "couldn't quack! Files were empty!" } | _ -> let result = - files |> Array.tryPick (fun file -> + files |> Array.tryPick (fun (fileName, file) -> let programOptD = match tryFindMemberByName "programLiveUpdate" file.Code with From f99fe36cc0268321a7f4693c724eb0a3fd330a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9=20Larivi=C3=A8re?= Date: Wed, 6 Mar 2019 11:02:12 +0100 Subject: [PATCH 2/2] Ignore unused member --- src/Fabulous.LiveUpdate/LiveUpdate.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Fabulous.LiveUpdate/LiveUpdate.fs b/src/Fabulous.LiveUpdate/LiveUpdate.fs index 340daec0c..773d971c7 100644 --- a/src/Fabulous.LiveUpdate/LiveUpdate.fs +++ b/src/Fabulous.LiveUpdate/LiveUpdate.fs @@ -215,11 +215,11 @@ module Extensions = lock interp (fun () -> let res = try - for (fileName, file) in files do + for (_, file) in files do printfn "LiveUpdate: adding declarations...." interp.AddDecls file.Code - for (fileName, file) in files do + for (_, file) in files do printfn "LiveUpdate: evaluating decls in code package for side effects...." interp.EvalDecls (envEmpty, file.Code) Result.Ok () @@ -239,7 +239,7 @@ module Extensions = | 0 -> { Quacked = "couldn't quack! Files were empty!" } | _ -> let result = - files |> Array.tryPick (fun (fileName, file) -> + files |> Array.tryPick (fun (_, file) -> let programOptD = match tryFindMemberByName "programLiveUpdate" file.Code with