From 25875c7dc14036f7e8d96e673e12754494b085b9 Mon Sep 17 00:00:00 2001
From: George Thomas <georgefsthomas@gmail.com>
Date: Thu, 19 Feb 2026 14:15:14 +0000
Subject: [PATCH] Move Haskell package to top level

---
 cabal.project                                       | 2 +-
 {haskell/exe => exe}/GarnetRs/Wrapped.hs            | 0
 {haskell/exe => exe}/Main.hs                        | 0
 haskell/garnet.cabal => garnet.cabal                | 0
 generate-bindings                                   | 4 ++--
 {haskell/generated => generated}/GarnetRs.hs        | 0
 {haskell/generated => generated}/GarnetRs/FunPtr.hs | 0
 {haskell/generated => generated}/GarnetRs/Safe.hs   | 0
 {haskell/generated => generated}/GarnetRs/Unsafe.hs | 0
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename {haskell/exe => exe}/GarnetRs/Wrapped.hs (100%)
 rename {haskell/exe => exe}/Main.hs (100%)
 rename haskell/garnet.cabal => garnet.cabal (100%)
 rename {haskell/generated => generated}/GarnetRs.hs (100%)
 rename {haskell/generated => generated}/GarnetRs/FunPtr.hs (100%)
 rename {haskell/generated => generated}/GarnetRs/Safe.hs (100%)
 rename {haskell/generated => generated}/GarnetRs/Unsafe.hs (100%)

diff --git a/cabal.project b/cabal.project
index 906a8ed..18a28d6 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,4 +1,4 @@
-packages: haskell
+packages: .
 
 -- TODO a total hack
 package garnet
diff --git a/haskell/exe/GarnetRs/Wrapped.hs b/exe/GarnetRs/Wrapped.hs
similarity index 100%
rename from haskell/exe/GarnetRs/Wrapped.hs
rename to exe/GarnetRs/Wrapped.hs
diff --git a/haskell/exe/Main.hs b/exe/Main.hs
similarity index 100%
rename from haskell/exe/Main.hs
rename to exe/Main.hs
diff --git a/haskell/garnet.cabal b/garnet.cabal
similarity index 100%
rename from haskell/garnet.cabal
rename to garnet.cabal
diff --git a/generate-bindings b/generate-bindings
index 7c9c9fc..cfc42bd 100755
--- a/generate-bindings
+++ b/generate-bindings
@@ -11,7 +11,7 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 RUST_DIR="$SCRIPT_DIR/rust"
-HASKELL_DIR="$SCRIPT_DIR/haskell"
+HASKELL_DIR="$SCRIPT_DIR"
 HEADER_NAME="garnet_rs.h"
 HEADER="$RUST_DIR/$HEADER_NAME"
 
@@ -124,4 +124,4 @@ hs-bindgen-cli preprocess \
 
 echo "=== Done ==="
 echo "Generated Haskell bindings in $HASKELL_DIR/generated/"
-echo "Run 'cabal run garnet' to test."
+echo "Run 'cabal run' to test."
diff --git a/haskell/generated/GarnetRs.hs b/generated/GarnetRs.hs
similarity index 100%
rename from haskell/generated/GarnetRs.hs
rename to generated/GarnetRs.hs
diff --git a/haskell/generated/GarnetRs/FunPtr.hs b/generated/GarnetRs/FunPtr.hs
similarity index 100%
rename from haskell/generated/GarnetRs/FunPtr.hs
rename to generated/GarnetRs/FunPtr.hs
diff --git a/haskell/generated/GarnetRs/Safe.hs b/generated/GarnetRs/Safe.hs
similarity index 100%
rename from haskell/generated/GarnetRs/Safe.hs
rename to generated/GarnetRs/Safe.hs
diff --git a/haskell/generated/GarnetRs/Unsafe.hs b/generated/GarnetRs/Unsafe.hs
similarity index 100%
rename from haskell/generated/GarnetRs/Unsafe.hs
rename to generated/GarnetRs/Unsafe.hs