cleaning up stuff

noinia · Nov 18, 2023 · 0d932aa · 0d932aa
1 parent a3a538a
commit 0d932aa
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 28 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -170,9 +170,9 @@ jobs:
           restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
       - name: haddock
         run: |
-          $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all > haddock.raw.txt
           "$HOME/.ghcup/bin/ghcup" set ghc "$HCVER"
-          $CABAL haddock-project --with-haddock=$HADDOCK --with-ghc=$HC
+          $CABAL haddock --disable-documentation --haddock-all $ARG_TESTS $ARG_BENCH all > haddock.raw.txt
+          # $CABAL haddock-project
         env:
           HCVER: ${{ matrix.compilerVersion }}
       - name: haddock-badge

diff --git a/hgeometry-examples/voronoiDiagram/Main.hs b/hgeometry-examples/voronoiDiagram/Main.hs
@@ -92,7 +92,7 @@ viewModel m = div_ [ ]
                                        ]
                                        canvasBody
                    , div_ [ onClick AddPoint ]
-                          [text $ "add point" ]
+                          [text "add point" ]
                    , div_ []
                           [text . ms . show $ m^.canvas.mouseCoordinates ]
                    , div_ []

diff --git a/hgeometry/ipe/test/Ipe/ReaderSpec.hs b/hgeometry/ipe/test/Ipe/ReaderSpec.hs
@@ -44,7 +44,7 @@ spec = do
     useSym = Symbol (Point2 320 736) "mark/disk(sx)"
 --     symAttrs =
 
-    translatedUse = "<use matrix=\"1 0 0 1 4.44908 -4.21815\" name=\"mark/disk(sx)\" pos=\"320 736\" size=\"normal\" stroke=\"black\"/>"
+    -- translatedUse = "<use matrix=\"1 0 0 1 4.44908 -4.21815\" name=\"mark/disk(sx)\" pos=\"320 736\" size=\"normal\" stroke=\"black\"/>"
 
 
 

diff --git a/hgeometry/kernel/src-quickcheck/HGeometry/Kernel/Instances.hs b/hgeometry/kernel/src-quickcheck/HGeometry/Kernel/Instances.hs
@@ -21,7 +21,7 @@ import HGeometry.HalfSpace
 import HGeometry.HyperPlane (HyperPlane(..))
 import HGeometry.HyperPlane.NonVertical (NonVerticalHyperPlane(..))
 import HGeometry.Interval
-import HGeometry.Interval.EndPoint
+import HGeometry.Interval.EndPoint()
 import HGeometry.Line.LineEQ
 import HGeometry.Line.PointAndVector
 import HGeometry.LineSegment

diff --git a/hgeometry/kernel/test/HGeometry/BoxSpec.hs b/hgeometry/kernel/test/HGeometry/BoxSpec.hs
@@ -14,7 +14,6 @@ import HGeometry.Point
 import HGeometry.Vector
 import Test.Hspec
 import Test.Hspec.QuickCheck
-import Test.QuickCheck
 -- import Test.Util
 
 --------------------------------------------------------------------------------

diff --git a/hgeometry/svg/test/Main.hs b/hgeometry/svg/test/Main.hs
@@ -2,24 +2,24 @@
 {-# LANGUAGE QuasiQuotes          #-}
 module Main (main) where
 
-import qualified Data.Text.Lazy.IO as Text
+-- import qualified Data.Text.Lazy.IO as Text
 import           HGeometry.Box
 import           HGeometry.Miso.Svg
 import           HGeometry.Miso.Svg.StaticCanvas
 import           HGeometry.Point
 import           Ipe
-import qualified Miso
+-- import qualified Miso
 import           Miso.Svg
 import           System.OsPath
 --------------------------------------------------------------------------------
 
 main :: IO ()
 main = renderSvgToFile [osp|/tmp/foo.svg|] myCanvasDrawing
 
-myDrawing = svg_ [ height_ "600", width_ "800" ]
-                 [ draw (Rectangle (Point2 10 20) (Point2 100 (200 :: Int)))
-                        [stroke_ "green" ]
-                 ]
+-- myDrawing = svg_ [ height_ "600", width_ "800" ]
+--                  [ draw (Rectangle (Point2 10 20) (Point2 100 (200 :: Int)))
+--                         [stroke_ "green" ]
+--                  ]
 
 myCanvas :: StaticCanvas Double
 myCanvas = staticCanvas 800 600

diff --git a/hgeometry/test-with-ipe/test/LineSegmentSpec.hs b/hgeometry/test-with-ipe/test/LineSegmentSpec.hs
@@ -3,23 +3,21 @@ module LineSegmentSpec where
 
 import Control.Lens
 import Control.Monad ((>=>))
-import Data.Bifunctor
 import Data.Vinyl
-import HGeometry.Boundary
-import HGeometry.Box
+-- import HGeometry.Box
+-- import HGeometry.Boundary
 import HGeometry.Ext
-import HGeometry.Intersection
-import HGeometry.Line
+-- import HGeometry.Intersection
+-- import HGeometry.Line
 import HGeometry.LineSegment
 import HGeometry.Number.Real.Rational
 import HGeometry.Point
-import HGeometry.Vector
+-- import HGeometry.Vector
 import Ipe
 import Ipe.Color
 import Paths_hgeometry
 import System.OsPath
 import Test.Hspec
-import Test.QuickCheck
 import Test.QuickCheck.Instances ()
 
 --------------------------------------------------------------------------------

diff --git a/hgeometry/test-with-ipe/test/VoronoiDiagram/VoronoiSpec.hs b/hgeometry/test-with-ipe/test/VoronoiDiagram/VoronoiSpec.hs
@@ -7,12 +7,12 @@ module VoronoiDiagram.VoronoiSpec
 import Control.Lens
 import Data.Default.Class
 import Golden
-import HGeometry.Combinatorial.Util
-import HGeometry.Duality
+-- import HGeometry.Combinatorial.Util
+-- import HGeometry.Duality
 import HGeometry.Ext
 import HGeometry.HyperPlane.Class
 import HGeometry.HyperPlane.NonVertical
-import HGeometry.LowerEnvelope
+-- import HGeometry.LowerEnvelope
 import HGeometry.Number.Real.Rational
 import HGeometry.Point
 import HGeometry.Vector
@@ -22,7 +22,7 @@ import Ipe.Color
 import System.OsPath
 import Test.Hspec
 import Test.QuickCheck.Instances ()
-import Test.Util
+-- import Test.Util
 
 --------------------------------------------------------------------------------
 

diff --git a/hgeometry/test/Polygon/TriangulateSpec.hs b/hgeometry/test/Polygon/TriangulateSpec.hs
@@ -1,17 +1,17 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Polygon.TriangulateSpec (spec) where
 
-import           Control.Lens
-import qualified Data.Vector as V
-import           HGeometry
-import           HGeometry.Ext
+-- import           Control.Lens
+-- import qualified Data.Vector as V
+-- import           HGeometry
+-- import           HGeometry.Ext
 -- import           HGeometry.PlanarSubdivision (PolygonFaceData)
 -- import           HGeometry.PlaneGraph
 -- import           HGeometry.PolygonSpec ()
 -- import           HGeometry.PolygonTriangulation.Triangulate
 -- import           HGeometry.PolygonTriangulation.Types
 import           Test.Hspec
-import           Test.Hspec.QuickCheck
+-- import           Test.Hspec.QuickCheck
 import           Test.QuickCheck.Instances ()
 
 --------------------------------------------------------------------------------