git.iko.soy/elk
on master help sign in
remove unused variable from Install code
95ca78eEvan Czaplicki
terminal/src/Install.hs+9−9
compare with master
unifiedsplit
@@ -56,11 +56,11 @@ run args () =
56 case oldOutline of
56 case oldOutline of
57 Outline.App outline ->
57 Outline.App outline ->
58 do changes <- makeAppPlan env pkg outline
58 do changes <- makeAppPlan env pkg outline
59− attemptChanges root env pkg oldOutline V.toChars changes
59+ attemptChanges root env oldOutline V.toChars changes
60
60
61 Outline.Pkg outline ->
61 Outline.Pkg outline ->
62 do changes <- makePkgPlan env pkg outline
62 do changes <- makePkgPlan env pkg outline
63− attemptChanges root env pkg oldOutline C.toChars changes
63+ attemptChanges root env oldOutline C.toChars changes
64
64
65
65
66
66
@@ -77,14 +77,14 @@ data Changes vsn
77type Task = Task.Task Exit.Install
77type Task = Task.Task Exit.Install
78
78
79
79
80−attemptChanges :: FilePath -> Solver.Env -> Pkg.Name -> Outline.Outline -> (a -> String) -> Changes a -> Task ()
80+attemptChanges :: FilePath -> Solver.Env -> Outline.Outline -> (a -> String) -> Changes a -> Task ()
81−attemptChanges root env pkg oldOutline toChars changes =
81+attemptChanges root env oldOutline toChars changes =
82 case changes of
82 case changes of
83 AlreadyInstalled ->
83 AlreadyInstalled ->
84 Task.io $ putStrLn "It is already installed!"
84 Task.io $ putStrLn "It is already installed!"
85
85
86 PromoteIndirect newOutline ->
86 PromoteIndirect newOutline ->
87− attemptChangesHelp root env pkg oldOutline newOutline $
87+ attemptChangesHelp root env oldOutline newOutline $
88 D.vcat
88 D.vcat
89 [ D.fillSep
89 [ D.fillSep
90 ["I","found","it","in","your","elm.json","file,"
90 ["I","found","it","in","your","elm.json","file,"
@@ -97,7 +97,7 @@ attemptChanges root env pkg oldOutline toChars changes =
97 ]
97 ]
98
98
99 PromoteTest newOutline ->
99 PromoteTest newOutline ->
100− attemptChangesHelp root env pkg oldOutline newOutline $
100+ attemptChangesHelp root env oldOutline newOutline $
101 D.vcat
101 D.vcat
102 [ D.fillSep
102 [ D.fillSep
103 ["I","found","it","in","your","elm.json","file,"
103 ["I","found","it","in","your","elm.json","file,"
@@ -114,7 +114,7 @@ attemptChanges root env pkg oldOutline toChars changes =
114 widths = Map.foldrWithKey (widen toChars) (Widths 0 0 0) changeDict
114 widths = Map.foldrWithKey (widen toChars) (Widths 0 0 0) changeDict
115 changeDocs = Map.foldrWithKey (addChange toChars widths) (Docs [] [] []) changeDict
115 changeDocs = Map.foldrWithKey (addChange toChars widths) (Docs [] [] []) changeDict
116 in
116 in
117− attemptChangesHelp root env pkg oldOutline newOutline $ D.vcat $
117+ attemptChangesHelp root env oldOutline newOutline $ D.vcat $
118 [ "Here is my plan:"
118 [ "Here is my plan:"
119 , viewChangeDocs changeDocs
119 , viewChangeDocs changeDocs
120 , ""
120 , ""
@@ -122,8 +122,8 @@ attemptChanges root env pkg oldOutline toChars changes =
122 ]
122 ]
123
123
124
124
125−attemptChangesHelp :: FilePath -> Solver.Env -> Pkg.Name -> Outline.Outline -> Outline.Outline -> D.Doc -> Task ()
125+attemptChangesHelp :: FilePath -> Solver.Env -> Outline.Outline -> Outline.Outline -> D.Doc -> Task ()
126−attemptChangesHelp root env pkg oldOutline newOutline question =
126+attemptChangesHelp root env oldOutline newOutline question =
127 Task.eio Exit.InstallBadDetails $
127 Task.eio Exit.InstallBadDetails $
128 BW.withScope $ \scope ->
128 BW.withScope $ \scope ->
129 do approved <- Reporting.ask question
129 do approved <- Reporting.ask question