Fix auto-merge problems

Author: szg251

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Rust/Config.hs

@@ -23,7 +23,7 @@ instance FromJSON R.ModuleName
 instance ToJSON R.CrateName
 instance FromJSON R.CrateName
 
-instance (FromJSON a) => FromJSON (R.Qualified a) where
+instance FromJSON a => FromJSON (R.Qualified a) where
   parseJSON v = do
     A.withArray
       "Qualified"
@@ -40,6 +40,6 @@ instance (FromJSON a) => FromJSON (R.Qualified a) where
       )
       v
 
-instance (ToJSON a) => ToJSON (R.Qualified a) where
+instance ToJSON a => ToJSON (R.Qualified a) where
   toJSON (R.Qualified'LibRef cn mn a) = A.Array $ Vector.fromList [toJSON cn, toJSON mn, toJSON a]
   toJSON (R.Qualified'Builtin a) = A.Array $ Vector.fromList [toJSON a]

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Rust/Print/Derive.hs

@@ -252,8 +252,8 @@ printTraitMethod fnName args returns implDoc =
    in indent 4 $
         "fn"
           <+> R.printRsValName fnName
-            <> "<'a>"
-            <> argsWithTypes
+          <> "<'a>"
+          <> argsWithTypes
           <+> "->"
           <+> R.printRsQTyName returns
           <+> braces (space <> implDoc <> argsLst)

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Rust/Print/InstanceDef.hs

@@ -29,7 +29,8 @@ printInstanceDef rsQTraitName ty =
    in case freeVars of
         [] -> \implDoc -> "impl" <+> headDoc <+> braces (line <> implDoc)
         _ -> \implDoc ->
-          "impl" <> printInstanceContext rsQTraitName freeVars
+          "impl"
+            <> printInstanceContext rsQTraitName freeVars
             <+> headDoc
             <+> braces (hardline <> space <> space <> implDoc)
 

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Rust/Print/LamVal.hs

@@ -1,8 +1,8 @@
 module LambdaBuffers.Codegen.Rust.Print.LamVal (printValueE, printInstance) where
 
 import Control.Lens ((&), (.~))
+import Control.Monad (replicateM)
 import Control.Monad.Error.Class (MonadError (throwError))
-import Control.Monad.Except (replicateM)
 import Data.Foldable (Foldable (toList))
 import Data.List (sortOn)
 import Data.Map qualified as Map
@@ -302,7 +302,7 @@ printTupleE iTyDefs l r = do
 printTextE :: MonadPrint m => Text.Text -> m (Doc ann)
 printTextE = return . fromStr . dquotes . pretty
 
-printCaseTextE :: (MonadPrint m) => PC.TyDefs -> LV.ValueE -> [(LV.ValueE, LV.ValueE)] -> (LV.ValueE -> LV.ValueE) -> m (Doc ann)
+printCaseTextE :: MonadPrint m => PC.TyDefs -> LV.ValueE -> [(LV.ValueE, LV.ValueE)] -> (LV.ValueE -> LV.ValueE) -> m (Doc ann)
 printCaseTextE iTyDefs txtVal cases otherCase = do
   caseValDoc <- printValueE iTyDefs txtVal
   caseDocs <-