optimise literalOsPath

Taking a ShortByteString and using OverloadedStrings should avoid it
being converted from a String.

The reason there is no IsString instance for OsPath is presumably the
bad behavior of IsString for ByteString on unicode btw. But
literalOsPath won't be used with unicode in git-annex.

Sponsored-by: unqueued

Annex/Magic.hs

@@ -5,6 +5,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
 
 module Annex.Magic (

Assistant/Install/Menu.hs

@@ -5,6 +5,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-tabs #-}
 

Build/DesktopFile.hs

@@ -6,6 +6,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
+{-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-tabs #-}
 

Config/Files.hs

@@ -5,6 +5,7 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
+{-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-tabs #-}
 
 module Config.Files where

Utility/FreeDesktop.hs

@@ -10,6 +10,7 @@
  - License: BSD-2-clause
  -}
 
+{-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-tabs #-}
 
 module Utility.FreeDesktop (

Utility/OSX.hs

@@ -5,6 +5,7 @@
  - License: BSD-2-clause
  -}
 
+{-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-tabs #-}
 
 module Utility.OSX (
@@ -18,7 +19,9 @@ import Common
 import Utility.UserInfo
 
 autoStartBase :: String -> OsPath
-autoStartBase label = literalOsPath "Library" </> literalOsPath "LaunchAgents" </> literalOsPath (label ++ ".plist")
+autoStartBase label = literalOsPath "Library" 
+	</> literalOsPath "LaunchAgents"
+	</> toOsPath label <> literalOsPath ".plist"
 
 systemAutoStart :: String -> OsPath
 systemAutoStart label = literalOsPath "/" </> autoStartBase label

Utility/OsPath.hs

@@ -46,10 +46,6 @@ instance OsPathConv FilePath where
 	toOsPath = toOsPath . toRawFilePath
 	fromOsPath = fromRawFilePath . fromOsPath
 
-{- Used for string constants. -}
-literalOsPath :: String -> OsPath
-literalOsPath = toOsPath
-
 #ifdef WITH_OSPATH
 instance OsPathConv RawFilePath where
 	toOsPath = bytesToOsPath . S.toShort
@@ -80,6 +76,10 @@ bytesFromOsPath = getPosixString . getOsString
 getSearchPath :: IO [OsPath]
 getSearchPath = map toOsPath <$> PB.getSearchPath
 
+{- Used for string constants. -}
+literalOsPath :: ShortByteString -> OsPath
+literalOsPath = bytesToOsPath
+
 #else
 {- When not building with WITH_OSPATH, use RawFilePath.
  -}
@@ -97,4 +97,7 @@ instance OsPathConv ShortByteString where
 
 unsafeFromChar :: Char -> Word8
 unsafeFromChar = fromIntegral . ord
+
+literalOsPath :: RawFilePath -> OsPath
+literalOsPath = id
 #endif

Utility/SshConfig.hs

@@ -5,6 +5,8 @@
  - License: BSD-2-clause
  -}
 
+{-# LANGUAGE OverloadedStrings #-}
+
 module Utility.SshConfig (
 	SshConfig(..),
 	Comment(..),

Utility/Tmp/Dir.hs

@@ -7,6 +7,7 @@
 
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_GHC -fno-warn-tabs #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Utility.Tmp.Dir (
 	withTmpDir,

Utility/Tor.hs

@@ -5,6 +5,8 @@
  - Licensed under the GNU AGPL version 3 or higher.
  -}
 
+{-# LANGUAGE OverloadedStrings #-}
+
 module Utility.Tor (
 	OnionPort,
 	OnionAddress(..),
@@ -143,7 +145,7 @@ hiddenServiceHostnameFile appname uid ident =
 hiddenServiceSocketFile :: AppName -> UserID -> UniqueIdent -> OsPath
 hiddenServiceSocketFile appname uid ident = 
 	varLibDir </> toOsPath appname
-		</> toOsPath (show uid ++ "_" ++ ident) </> toOsPath "s"
+		</> toOsPath (show uid ++ "_" ++ ident) </> literalOsPath "s"
 
 -- | Parse torrc, to get the socket file used for a hidden service with
 -- the specified UniqueIdent.
@@ -155,7 +157,7 @@ getHiddenServiceSocketFile _appname uid ident =
 	parse [] = Nothing
 	parse (("HiddenServiceDir":hsdir:[]):("HiddenServicePort":_hsport:hsaddr:[]):rest)
 		| "unix:" `isPrefixOf` hsaddr && hasident (toOsPath hsdir) =
-			Just $ toOsPath $ drop (length "unix:") hsaddr
+			Just $ toOsPath $ drop (length ("unix:" :: String)) hsaddr
 		| otherwise = parse rest
 	parse (_:rest) = parse rest