simplify and speed up Utility.FileSystemEncoding
This eliminates the distinction between decodeBS and decodeBS', encodeBS and encodeBS', etc. The old implementation truncated at NUL, and the primed versions had to do extra work to avoid that problem. The new implementation does not truncate at NUL, and is also a lot faster. (Benchmarked at 2x faster for decodeBS and 3x for encodeBS; more for the primed versions.) Note that filepath-bytestring 1.4.2.1.8 contains the same optimisation, and upgrading to it will speed up to/fromRawFilePath. AFAIK, nothing relied on the old behavior of truncating at NUL. Some code used the faster versions in places where I was sure there would not be a NUL. So this change is unlikely to break anything. Also, moved s2w8 and w82s out of the module, as they do not involve filesystem encoding really. Sponsored-by: Shae Erisson on Patreon
This commit is contained in:
parent
a38b724bfa
commit
fa62c98910
55 changed files with 138 additions and 217 deletions
|
@ -37,7 +37,7 @@ remoteKeyToRemoteName :: ConfigKey -> Maybe RemoteName
|
|||
remoteKeyToRemoteName (ConfigKey k)
|
||||
| "remote." `S.isPrefixOf` k =
|
||||
let n = S.intercalate "." $ dropFromEnd 1 $ drop 1 $ S8.split '.' k
|
||||
in if S.null n then Nothing else Just (decodeBS' n)
|
||||
in if S.null n then Nothing else Just (decodeBS n)
|
||||
| otherwise = Nothing
|
||||
|
||||
{- Construct a legal git remote name out of an arbitrary input string.
|
||||
|
@ -90,7 +90,7 @@ parseRemoteLocation s repo = ret $ calcloc s
|
|||
| null insteadofs = l
|
||||
| otherwise = replacement ++ drop (S.length bestvalue) l
|
||||
where
|
||||
replacement = decodeBS' $ S.drop (S.length prefix) $
|
||||
replacement = decodeBS $ S.drop (S.length prefix) $
|
||||
S.take (S.length bestkey - S.length suffix) bestkey
|
||||
(bestkey, bestvalue) =
|
||||
case maximumBy longestvalue insteadofs of
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue