Skip to content

Commit 0ad1129

Browse files
functorafunctora
committed
witch-mini -> functora-witch
1 parent 4ec6ed4 commit 0ad1129

File tree

15 files changed

+66
-64
lines changed

15 files changed

+66
-64
lines changed

‎cabal.project‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ else
6565
pub/hs-bitcoin-keys/bitcoin-keys/*.cabal
6666
pub/haskell-bitcoin-script/*.cabal
6767
pub/bitfinex-client/*.cabal
68+
pub/functora-witch/*.cabal
6869
pub/singlethongs/*.cabal
6970
pub/functora/src/*.cabal
7071
pub/vector-space/*.cabal
71-
pub/witch-mini/*.cabal
7272
pub/selective/*.cabal
7373
pub/universum/*.cabal
7474
pub/functora/*.cabal
@@ -106,10 +106,10 @@ if os(wasi)
106106
pub/hs-bitcoin-hash/bitcoin-hash/*.cabal
107107
pub/hs-bitcoin-keys/bitcoin-keys/*.cabal
108108
pub/haskell-bitcoin-script/*.cabal
109+
pub/functora-witch/*.cabal
109110
pub/singlethongs/*.cabal
110111
pub/functora/src/*.cabal
111112
pub/vector-space/*.cabal
112-
pub/witch-mini/*.cabal
113113
pub/selective/*.cabal
114114
pub/universum/*.cabal
115115
pub/xlsx/*.cabal
@@ -185,10 +185,10 @@ if arch(javascript)
185185
pub/hs-bitcoin-hash/bitcoin-hash/*.cabal
186186
pub/hs-bitcoin-keys/bitcoin-keys/*.cabal
187187
pub/haskell-bitcoin-script/*.cabal
188+
pub/functora-witch/*.cabal
188189
pub/singlethongs/*.cabal
189190
pub/functora/src/*.cabal
190191
pub/vector-space/*.cabal
191-
pub/witch-mini/*.cabal
192192
pub/selective/*.cabal
193193
pub/universum/*.cabal
194194
pub/miso/*.cabal

‎ghcjs/overlays.nix‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,13 @@
209209
#
210210
# Local
211211
#
212-
witch-mini = doJailbreak (
212+
functora-witch = doJailbreak (
213213
self.callCabal2nix
214-
"witch-mini"
214+
"functora-witch"
215215
(
216216
pkgs.nix-gitignore.gitignoreSourcePure
217217
./../.gitignore
218-
./../pub/witch-mini
218+
./../pub/functora-witch
219219
)
220220
{}
221221
);

‎pub/witch-mini/witch-mini.cabal‎ renamed to ‎pub/functora-witch/functora-witch.cabal‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
cabal-version: 2.2
2-
name: witch-mini
2+
name: functora-witch
33
version: 1.2.0.2
44
synopsis: Convert values from one type into another.
5-
description: Witch converts values from one type into another.
5+
description:
6+
A minimal fork of the 'witch' library, without dependencies on 'time' and 'template-haskell'. Compatible with a broader range of GHC, GHCJS, and GHC WASM compilers.
7+
68
build-type: Simple
79
category: Data
810
license: MIT
911
maintainer: Functora
1012

1113
source-repository head
1214
location:
13-
https://github.com/functora/functora.github.io/tree/master/pub/witch-mini
15+
https://github.com/functora/functora.github.io/tree/master/pub/functora-witch
1416

1517
type: git
1618

@@ -44,23 +46,23 @@ common library
4446

4547
common executable
4648
import: library
47-
build-depends: witch-mini
49+
build-depends: functora-witch
4850
ghc-options: -rtsopts -threaded
4951

5052
library
5153
import: library
5254
exposed-modules:
53-
Witch.Mini
54-
Witch.Mini.Encoding
55-
Witch.Mini.From
56-
Witch.Mini.Instances
57-
Witch.Mini.TryFrom
58-
Witch.Mini.TryFromException
59-
Witch.Mini.Utility
55+
Functora.Witch
56+
Functora.Witch.Encoding
57+
Functora.Witch.From
58+
Functora.Witch.Instances
59+
Functora.Witch.TryFrom
60+
Functora.Witch.TryFromException
61+
Functora.Witch.Utility
6062

6163
hs-source-dirs: source/library
6264

63-
test-suite witch-mini-test-suite
65+
test-suite functora-witch-test-suite
6466
import: executable
6567
build-depends:
6668
, HUnit >=1.6.1 && <1.7

‎pub/witch-mini/source/library/Witch/Mini.hs‎ renamed to ‎pub/functora-witch/source/library/Functora/Witch.hs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,33 @@
1111
--
1212
-- Please consider reading the blog post that announces this library:
1313
-- <https://taylor.fausak.me/2021/07/13/witch/>
14-
module Witch.Mini
14+
module Functora.Witch
1515
( -- * Type classes
1616

1717
-- ** From
18-
Witch.Mini.From.From (from),
19-
Witch.Mini.Utility.into,
18+
Functora.Witch.From.From (from),
19+
Functora.Witch.Utility.into,
2020

2121
-- ** TryFrom
22-
Witch.Mini.TryFrom.TryFrom (tryFrom),
23-
Witch.Mini.Utility.tryInto,
22+
Functora.Witch.TryFrom.TryFrom (tryFrom),
23+
Functora.Witch.Utility.tryInto,
2424

2525
-- * Data types
26-
Witch.Mini.TryFromException.TryFromException (..),
26+
Functora.Witch.TryFromException.TryFromException (..),
2727

2828
-- ** Encodings
29-
Witch.Mini.Encoding.ISO_8859_1,
30-
Witch.Mini.Encoding.UTF_8,
31-
Witch.Mini.Encoding.UTF_16LE,
32-
Witch.Mini.Encoding.UTF_16BE,
33-
Witch.Mini.Encoding.UTF_32LE,
34-
Witch.Mini.Encoding.UTF_32BE,
29+
Functora.Witch.Encoding.ISO_8859_1,
30+
Functora.Witch.Encoding.UTF_8,
31+
Functora.Witch.Encoding.UTF_16LE,
32+
Functora.Witch.Encoding.UTF_16BE,
33+
Functora.Witch.Encoding.UTF_32LE,
34+
Functora.Witch.Encoding.UTF_32BE,
3535

3636
-- * Utilities
37-
Witch.Mini.Utility.via,
38-
Witch.Mini.Utility.tryVia,
39-
Witch.Mini.Utility.maybeTryFrom,
40-
Witch.Mini.Utility.eitherTryFrom,
37+
Functora.Witch.Utility.via,
38+
Functora.Witch.Utility.tryVia,
39+
Functora.Witch.Utility.maybeTryFrom,
40+
Functora.Witch.Utility.eitherTryFrom,
4141

4242
-- ** Unsafe
4343

@@ -48,8 +48,8 @@ module Witch.Mini
4848
-- 'Witch.TryFrom.tryFrom'. And if you're converting a literal value,
4949
-- consider using the Template Haskell conversion functions like
5050
-- 'Witch.Lift.liftedFrom'.
51-
Witch.Mini.Utility.unsafeFrom,
52-
Witch.Mini.Utility.unsafeInto,
51+
Functora.Witch.Utility.unsafeFrom,
52+
Functora.Witch.Utility.unsafeInto,
5353

5454
-- * Notes
5555

@@ -258,9 +258,9 @@ module Witch.Mini
258258
)
259259
where
260260

261-
import qualified Witch.Mini.Encoding
262-
import qualified Witch.Mini.From
263-
import Witch.Mini.Instances ()
264-
import qualified Witch.Mini.TryFrom
265-
import qualified Witch.Mini.TryFromException
266-
import qualified Witch.Mini.Utility
261+
import qualified Functora.Witch.Encoding
262+
import qualified Functora.Witch.From
263+
import Functora.Witch.Instances ()
264+
import qualified Functora.Witch.TryFrom
265+
import qualified Functora.Witch.TryFromException
266+
import qualified Functora.Witch.Utility

‎pub/witch-mini/source/library/Witch/Mini/Encoding.hs‎ renamed to ‎pub/functora-witch/source/library/Functora/Witch/Encoding.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{-# LANGUAGE DataKinds #-}
22

3-
module Witch.Mini.Encoding where
3+
module Functora.Witch.Encoding where
44

55
import qualified Data.Tagged as Tagged
66

‎pub/witch-mini/source/library/Witch/Mini/From.hs‎ renamed to ‎pub/functora-witch/source/library/Functora/Witch/From.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{-# LANGUAGE DefaultSignatures #-}
22
{-# LANGUAGE MultiParamTypeClasses #-}
33

4-
module Witch.Mini.From where
4+
module Functora.Witch.From where
55

66
import qualified Data.Coerce as Coerce
77

‎pub/witch-mini/source/library/Witch/Mini/Instances.hs‎ renamed to ‎pub/functora-witch/source/library/Functora/Witch/Instances.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{-# LANGUAGE TypeOperators #-}
88
{-# OPTIONS_GHC -Wno-orphans #-}
99

10-
module Witch.Mini.Instances where
10+
module Functora.Witch.Instances where
1111

1212
import qualified Control.Exception as Exception
1313
import qualified Control.Monad as Monad
@@ -37,15 +37,15 @@ import qualified Data.Text.Encoding.Error as Text
3737
import qualified Data.Text.Lazy as LazyText
3838
import qualified Data.Text.Lazy.Encoding as LazyText
3939
import qualified Data.Word as Word
40+
import qualified Functora.Witch.Encoding as Encoding
41+
import qualified Functora.Witch.From as From
42+
import qualified Functora.Witch.TryFrom as TryFrom
43+
import qualified Functora.Witch.TryFromException as TryFromException
44+
import qualified Functora.Witch.Utility as Utility
4045
import qualified GHC.Float as Float
4146
import qualified Numeric
4247
import qualified Numeric.Natural as Natural
4348
import qualified System.IO.Unsafe as Unsafe
44-
import qualified Witch.Mini.Encoding as Encoding
45-
import qualified Witch.Mini.From as From
46-
import qualified Witch.Mini.TryFrom as TryFrom
47-
import qualified Witch.Mini.TryFromException as TryFromException
48-
import qualified Witch.Mini.Utility as Utility
4949

5050
-- | Uses 'id'.
5151
instance {-# OVERLAPS #-} (a ~ b) => From.From a b where

‎pub/witch-mini/source/library/Witch/Mini/TryFrom.hs‎ renamed to ‎pub/functora-witch/source/library/Functora/Witch/TryFrom.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{-# LANGUAGE MultiParamTypeClasses #-}
22

3-
module Witch.Mini.TryFrom where
3+
module Functora.Witch.TryFrom where
44

5-
import qualified Witch.Mini.TryFromException as TryFromException
5+
import qualified Functora.Witch.TryFromException as TryFromException
66

77
-- | This type class is for converting values from some @source@ type into
88
-- some other @target@ type. The constraint @'TryFrom' source target@ means

‎pub/witch-mini/source/library/Witch/Mini/TryFromException.hs‎ renamed to ‎pub/functora-witch/source/library/Functora/Witch/TryFromException.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{-# LANGUAGE ScopedTypeVariables #-}
22

3-
module Witch.Mini.TryFromException where
3+
module Functora.Witch.TryFromException where
44

55
import qualified Control.Exception as Exception
66
import qualified Data.Proxy as Proxy

‎pub/witch-mini/source/library/Witch/Mini/Utility.hs‎ renamed to ‎pub/functora-witch/source/library/Functora/Witch/Utility.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{-# LANGUAGE AllowAmbiguousTypes #-}
22
{-# LANGUAGE ScopedTypeVariables #-}
33

4-
module Witch.Mini.Utility where
4+
module Functora.Witch.Utility where
55

66
import qualified Control.Exception as Exception
77
import qualified Data.Coerce as Coerce
88
import qualified Data.Typeable as Typeable
9+
import qualified Functora.Witch.From as From
10+
import qualified Functora.Witch.TryFrom as TryFrom
11+
import qualified Functora.Witch.TryFromException as TryFromException
912
import qualified GHC.Stack as Stack
10-
import qualified Witch.Mini.From as From
11-
import qualified Witch.Mini.TryFrom as TryFrom
12-
import qualified Witch.Mini.TryFromException as TryFromException
1313

1414
-- | This is the same as 'id'. This can be an ergonomic way to pin down a
1515
-- polymorphic type in a function pipeline. For example:

0 commit comments

Comments
 (0)