Reduced some dictionary double-lookups (#378)

SaturnFramework · Nov 30, 2023 · 8511856 · 8511856
1 parent dc62a7e
commit 8511856
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/Saturn/Common.fs b/src/Saturn/Common.fs
@@ -37,9 +37,9 @@ module Common =
   let private getSavedSubPath (ctx : HttpContext) =
     let inline strOption (str : string) =
       if String.IsNullOrEmpty str then None else Some str
-    if ctx.Items.ContainsKey RouteKey
-    then ctx.Items.Item RouteKey |> string |> strOption
-    else None
+    match ctx.Items.TryGetValue RouteKey with
+    | true, route -> route |> string |> strOption
+    | false, _ -> None
 
   let private handlerWithRootedPath (path : string) (handler : HttpHandler) : HttpHandler =
     fun (next : HttpFunc) (ctx : HttpContext) ->

diff --git a/src/Saturn/Controller.fs b/src/Saturn/Controller.fs
@@ -183,10 +183,9 @@ module Controller =
     member __.Plug(state, actions, handler) =
       let addPlug state action handler =
         let newplugs =
-          if state.Plugs.ContainsKey action then
-            state.Plugs.Add(action, (handler::state.Plugs.[action]))
-          else
-            state.Plugs.Add(action,[handler])
+          match state.Plugs.TryGetValue action with
+          | true, acts -> state.Plugs.Add(action, (handler::acts))
+          | false, _ -> state.Plugs.Add(action,[handler])
         {state with Plugs = newplugs}
 
       if actions |> List.contains All then

diff --git a/src/Saturn/ControllerEndpoint.fs b/src/Saturn/ControllerEndpoint.fs
@@ -183,10 +183,9 @@ module Controller =
     member __.Plug(state, actions, handler) =
       let addPlug state action handler =
         let newplugs =
-          if state.Plugs.ContainsKey action then
-            state.Plugs.Add(action, (handler::state.Plugs.[action]))
-          else
-            state.Plugs.Add(action,[handler])
+          match state.Plugs.TryGetValue action with
+          | true, acts -> state.Plugs.Add(action, (handler::acts))
+          | false, _ -> state.Plugs.Add(action,[handler])
         {state with Plugs = newplugs}
 
       if actions |> List.contains All then