git.iko.soy/elk
on master help sign in
Switch to Elm.Version and Data.Utf8 in in Elm.Diff and Elm.Publish
commit8db2300bebd47cba3ded573dbda55b82f8ecb268 authorEvan Czaplicki <evancz@users.noreply.github.com> dateSat 29 Dec 2018, 10:26 (8 years ago) parente7ca69f
2 files changed+23−22
compare with master
unifiedsplit
builder/src/Elm/Diff.hs+12−11 builder/src/Elm/Publish.hs+11−11
builder/src/Elm/Diff.hs+12−11
@@ -23,6 +23,7 @@ import qualified Elm.Package as Pkg
2323import qualified Elm.Project as Project
2424import qualified Elm.Project.Json as Project
2525import qualified Elm.Project.Summary as Summary
26+import qualified Elm.Version as V
2627import Reporting.Doc ((<>), (<+>))
2728import qualified Reporting.Doc as D
2829import qualified Reporting.Exit as Exit
@@ -38,9 +39,9 @@ import qualified Reporting.Task as Task
3839
3940data Args
4041 = CodeVsLatest
41− | CodeVsExactly Pkg.Version
42− | LocalInquiry Pkg.Version Pkg.Version
43− | GlobalInquiry Pkg.Name Pkg.Version Pkg.Version
42+ | CodeVsExactly V.Version
43+ | LocalInquiry V.Version V.Version
44+ | GlobalInquiry Pkg.Name V.Version V.Version
4445
4546
4647diff :: Args -> Task.Task ()
@@ -85,7 +86,7 @@ throw exit =
8586-- DIFF HELPERS
8687
8788
88−getDocs :: Pkg.Name -> [Pkg.Version] -> Pkg.Version -> Task.Task Docs.Documentation
89+getDocs :: Pkg.Name -> [V.Version] -> V.Version -> Task.Task Docs.Documentation
8990getDocs name allVersions version =
9091 if elem version allVersions then
9192 Cache.getDocs name version
@@ -93,7 +94,7 @@ getDocs name allVersions version =
9394 throw $ E.UnknownVersion name version allVersions
9495
9596
96−getPackageInfo :: Task.Task (Summary.Summary, Pkg.Name, [Pkg.Version])
97+getPackageInfo :: Task.Task (Summary.Summary, Pkg.Name, [V.Version])
9798getPackageInfo =
9899 do summary <- Project.getRoot
99100 case Summary._project summary of
@@ -134,7 +135,7 @@ toDoc localizer changes@(PackageChanges added changed removed) =
134135 else
135136 let
136137 magDoc =
137− D.fromString (Diff.magnitudeToString (Diff.toMagnitude changes))
138+ D.fromChars (Diff.magnitudeToString (Diff.toMagnitude changes))
138139
139140 header =
140141 "This is a" <+> D.green magDoc <+> "change."
@@ -142,13 +143,13 @@ toDoc localizer changes@(PackageChanges added changed removed) =
142143 addedChunk =
143144 if null added then [] else
144145 [ Chunk "ADDED MODULES" MINOR $
145− D.vcat $ map (D.fromString . ModuleName.nameToString) added
146+ D.vcat $ map (D.fromUtf8 . ModuleName.nameToString) added
146147 ]
147148
148149 removedChunk =
149150 if null removed then [] else
150151 [ Chunk "REMOVED MODULES" MAJOR $
151− D.vcat $ map (D.fromString . ModuleName.nameToString) removed
152+ D.vcat $ map (D.fromUtf8 . ModuleName.nameToString) removed
152153 ]
153154
154155 chunks =
@@ -172,7 +173,7 @@ chunkToDoc (Chunk title magnitude details) =
172173 Diff.magnitudeToString magnitude
173174
174175 header =
175− "----" <+> D.fromString title <+> "-" <+> D.fromString magDoc <+> "----"
176+ "----" <+> D.fromChars title <+> "-" <+> D.fromChars magDoc <+> "----"
176177 in
177178 D.vcat
178179 [ D.dullcyan header
@@ -201,7 +202,7 @@ changesToChunk localizer (name, changes@(ModuleChanges unions aliases values bin
201202 (binopAdd, binopChange, binopRemove) =
202203 changesToDocTriple (binopToDoc localizer) binops
203204 in
204− Chunk (Name.toString name) magnitude $
205+ Chunk (Name.toChars name) magnitude $
205206 D.vcat $ List.intersperse "" $ Maybe.catMaybes $
206207 [ changesToDoc "Added" unionAdd aliasAdd valueAdd binopAdd
207208 , changesToDoc "Removed" unionRemove aliasRemove valueRemove binopRemove
@@ -235,7 +236,7 @@ changesToDoc categoryName unions aliases values binops =
235236
236237 else
237238 Just $ D.vcat $
238− D.fromString categoryName <> ":" : unions ++ aliases ++ binops ++ values
239+ D.fromChars categoryName <> ":" : unions ++ aliases ++ binops ++ values
239240
240241
241242unionToDoc :: L.Localizer -> Name.Name -> Docs.Union -> D.Doc
builder/src/Elm/Publish.hs+11−11
@@ -6,7 +6,7 @@ import Control.Monad (when)
66import Control.Monad.Except (catchError, runExceptT)
77import Control.Monad.Trans (liftIO, lift)
88import qualified Data.List as List
9−import qualified Data.Text as Text
9+import qualified Data.Utf8 as Utf8
1010import qualified System.Directory as Dir
1111import qualified System.Exit as Exit
1212import System.FilePath ((</>))
@@ -19,9 +19,9 @@ import qualified Deps.Website as Website
1919import qualified Elm.Bump as Bump
2020import qualified Elm.Docs as Docs
2121import qualified Elm.Package as Pkg
22−import qualified Elm.Project as Project
2322import qualified Elm.Project.Json as Project
2423import qualified Elm.Project.Summary as Summary
24+import qualified Elm.Version as V
2525import qualified Reporting.Exit as Exit
2626import qualified Reporting.Exit.Publish as E
2727import qualified Reporting.Progress as Progress
@@ -71,9 +71,9 @@ throw exit =
7171-- VERIFY SUMMARY
7272
7373
74−badSummary :: Text.Text -> Bool
74+badSummary :: Utf8.String -> Bool
7575badSummary summary =
76− Text.null summary || Project.defaultSummary == summary
76+ Utf8.isEmpty summary || Project.defaultSummary == summary
7777
7878
7979noExposed :: Project.Exposed -> Bool
@@ -124,7 +124,7 @@ verifyLicense root =
124124-- VERIFY GITHUB TAG
125125
126126
127−verifyTag :: Pkg.Name -> Pkg.Version -> Task.Task String
127+verifyTag :: Pkg.Name -> V.Version -> Task.Task String
128128verifyTag name version =
129129 phase (Progress.CheckTag version) $
130130 Website.githubCommit name version `catchError` \_ ->
@@ -135,7 +135,7 @@ verifyTag name version =
135135-- VERIFY NO LOCAL CHANGES SINCE TAG
136136
137137
138−verifyNoChanges :: String -> Pkg.Version -> Task.Task ()
138+verifyNoChanges :: String -> V.Version -> Task.Task ()
139139verifyNoChanges commitHash version =
140140 phase Progress.CheckChanges $
141141 do maybeGit <- liftIO $ Dir.findExecutable "git"
@@ -160,7 +160,7 @@ verifyNoChanges commitHash version =
160160-- VERIFY THAT ZIP BUILDS / COMPUTE HASH
161161
162162
163−verifyZip :: Pkg.Name -> Pkg.Version -> Task.Task Website.Sha
163+verifyZip :: Pkg.Name -> V.Version -> Task.Task Website.Sha
164164verifyZip name version =
165165 withTempDir $ \dir ->
166166 do hash <- phase Progress.CheckDownload $
@@ -169,7 +169,7 @@ verifyZip name version =
169169 phase Progress.CheckBuild $
170170 do runner <- Task.getSilentRunner
171171 result <- liftIO $ Dir.withCurrentDirectory dir $ runner $
172− Task.silently $ Project.generateDocs =<< Project.getRoot
172+ Task.silently $ error "TODO Project.generateDocs =<< Project.getRoot"
173173 either Task.throw (\_ -> return ()) result
174174
175175 return hash
@@ -204,7 +204,7 @@ phase publishPhase task =
204204-- VERIFY VERSION
205205
206206
207−verifyVersion :: Pkg.Name -> Pkg.Version -> Docs.Documentation -> Maybe [Pkg.Version] -> Task.Task ()
207+verifyVersion :: Pkg.Name -> V.Version -> Docs.Documentation -> Maybe [V.Version] -> Task.Task ()
208208verifyVersion name version docs maybePublishedVersions =
209209 let
210210 reportBumpPhase bumpPhase =
@@ -213,7 +213,7 @@ verifyVersion name version docs maybePublishedVersions =
213213 do reportBumpPhase Progress.StatedVersion
214214 case maybePublishedVersions of
215215 Nothing ->
216− if version == Pkg.initialVersion then
216+ if version == V.one then
217217 reportBumpPhase Progress.GoodStart
218218 else
219219 throw (E.NotInitialVersion version)
@@ -230,7 +230,7 @@ verifyVersion name version docs maybePublishedVersions =
230230 Task.throw exit
231231
232232
233−verifyBump :: Pkg.Name -> Pkg.Version -> Docs.Documentation -> [Pkg.Version] -> Task.Task (Pkg.Version, Diff.Magnitude)
233+verifyBump :: Pkg.Name -> V.Version -> Docs.Documentation -> [V.Version] -> Task.Task (V.Version, Diff.Magnitude)
234234verifyBump name statedVersion newDocs publishedVersions =
235235 let
236236 possibleBumps =