Compat.HieAs (810): use fromMaybe

Author: Anton-Latukha

hie-compat/src-ghc810/Compat/HieAst.hs

@@ -50,7 +50,7 @@ import qualified Data.Map as M
 import qualified Data.Set as S
 import Data.Data                  ( Data, Typeable )
 import Data.List                  ( foldl1' )
-import Data.Maybe                 ( listToMaybe )
+import Data.Maybe                 ( listToMaybe, fromMaybe )
 import Control.Monad.Trans.Reader
 import Control.Monad.Trans.Class  ( lift )
 
@@ -506,9 +506,7 @@ instance ToHie (Context (Located Var)) where
       C context (L (RealSrcSpan span) name')
         -> do
         m <- asks name_remapping
-        let name = case lookupNameEnv m (varName name') of
-              Just var -> var
-              Nothing-> name'
+        let name = fromMaybe name' (lookupNameEnv m (varName name'))
         pure
           [Node
             (NodeInfo S.empty [] $
@@ -523,9 +521,7 @@ instance ToHie (Context (Located Name)) where
   toHie c = case c of
       C context (L (RealSrcSpan span) name') -> do
         m <- asks name_remapping
-        let name = case lookupNameEnv m name' of
-              Just var -> varName var
-              Nothing -> name'
+        let name = maybe name' varName (lookupNameEnv m name')
         pure
           [Node
             (NodeInfo S.empty [] $