Fix auto-merge problems

Author: szg251

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

@@ -334,14 +334,10 @@ printRefE pkgs ref = do
   qvn <- LV.resolveRef ref
   case ref of
     (argTy : _, builtin)
-      | builtin
-          == "toPlutusData"
-          || builtin
-            == "fromPlutusData"
-          || builtin
-            == "toJson"
-          || builtin
-            == "fromJson" -> do
+      | builtin == "toPlutusData"
+          || builtin == "fromPlutusData"
+          || builtin == "toJson"
+          || builtin == "fromJson" -> do
           lamTyDoc <- printLamTy pkgs argTy
           methodDoc <- R.printRsValName . R.qualifiedEntity <$> LV.importValue qvn
           return $ angles lamTyDoc <> R.doubleColon <> methodDoc
@@ -380,13 +376,13 @@ printValueE pkgs iTyDefs (LV.CaseTextE txtVal cases otherCase) = printCaseTextE
 printValueE pkgs iTyDefs (LV.TupleE l r) = printTupleE pkgs iTyDefs l r
 printValueE _ _ (LV.ErrorE err) = throwInternalError $ "LamVal error builtin was called " <> err
 
--- | This is a hack, to help Rust figure out types of closures (lambda expressions)
+-- | HACK(szg251): This is a hack, to help Rust figure out types of closures (lambda expressions)
 printInstance :: MonadPrint m => R.PkgMap -> [R.QTyName] -> PC.TyDefs -> LV.ValueE -> m (Doc ann)
 printInstance pkgs [] iTyDefs lamVal = printValueE pkgs iTyDefs lamVal
 printInstance pkgs argTys iTyDefs (LV.LamE lamVal) = printInstanceLamE pkgs argTys iTyDefs lamVal
 printInstance _ _ _ _ = throwInternalError "LamE expression expected with predefined argument types"
 
--- | This is a hack, to help Rust figure out types of closures (lambda expressions)
+-- | HACK(szg251): This is a hack, to help Rust figure out types of closures (lambda expressions)
 printInstanceLamE :: MonadPrint m => R.PkgMap -> [R.QTyName] -> PC.TyDefs -> (LV.ValueE -> LV.ValueE) -> m (Doc ann)
 printInstanceLamE _ [] _ _ = throwInternalError "LamE expression expected with predefined argument types"
 printInstanceLamE pkgs (argTy : argTys) iTyDefs lamVal = do