renaming: Arch -> H2

kazu-yamamoto · Nov 14, 2023 · 8c0e236 · 8c0e236
1 parent aaf977c
commit 8c0e236
Show file tree

Hide file tree

Showing 30 changed files with 130 additions and 130 deletions.
diff --git a/Network/HTTP2/Arch.hs b/Network/HTTP2/Arch.hs
diff --git a/Network/HTTP2/Client.hs b/Network/HTTP2/Client.hs
@@ -128,7 +128,7 @@ import Data.IORef (readIORef)
 import Network.HTTP.Types
 
 import Network.HPACK
-import Network.HTTP2.Arch
+import Network.HTTP2.H2
 import Network.HTTP2.Client.Run
 import Network.HTTP2.Client.Types
 import Network.HTTP2.Frame

diff --git a/Network/HTTP2/Client/Internal.hs b/Network/HTTP2/Client/Internal.hs
@@ -8,6 +8,6 @@ module Network.HTTP2.Client.Internal (
     runIO,
 ) where
 
-import Network.HTTP2.Arch
+import Network.HTTP2.H2
 import Network.HTTP2.Client.Run
 import Network.HTTP2.Client.Types
diff --git a/Network/HTTP2/Client/Run.hs b/Network/HTTP2/Client/Run.hs
@@ -14,7 +14,7 @@ import UnliftIO.Concurrent
 import UnliftIO.STM
 
 import Imports
-import Network.HTTP2.Arch
+import Network.HTTP2.H2
 import Network.HTTP2.Client.Types
 import Network.HTTP2.Frame
 

diff --git a/Network/HTTP2/Client/Types.hs b/Network/HTTP2/Client/Types.hs
@@ -2,7 +2,7 @@
 
 module Network.HTTP2.Client.Types where
 
-import Network.HTTP2.Arch
+import Network.HTTP2.H2
 
 ----------------------------------------------------------------
 

diff --git a/Network/HTTP2/H2.hs b/Network/HTTP2/H2.hs
@@ -0,0 +1,35 @@
+module Network.HTTP2.H2 (
+    module Network.HTTP2.H2.Config,
+    module Network.HTTP2.H2.Context,
+    module Network.HTTP2.H2.EncodeFrame,
+    module Network.HTTP2.H2.File,
+    module Network.HTTP2.H2.HPACK,
+    module Network.HTTP2.H2.Manager,
+    module Network.HTTP2.H2.Queue,
+    module Network.HTTP2.H2.ReadN,
+    module Network.HTTP2.H2.Receiver,
+    module Network.HTTP2.H2.Sender,
+    module Network.HTTP2.H2.Settings,
+    module Network.HTTP2.H2.Status,
+    module Network.HTTP2.H2.Stream,
+    module Network.HTTP2.H2.StreamTable,
+    module Network.HTTP2.H2.Types,
+    module Network.HTTP2.H2.Window,
+) where
+
+import Network.HTTP2.H2.Config
+import Network.HTTP2.H2.Context
+import Network.HTTP2.H2.EncodeFrame
+import Network.HTTP2.H2.File
+import Network.HTTP2.H2.HPACK
+import Network.HTTP2.H2.Manager
+import Network.HTTP2.H2.Queue
+import Network.HTTP2.H2.ReadN
+import Network.HTTP2.H2.Receiver
+import Network.HTTP2.H2.Sender
+import Network.HTTP2.H2.Settings
+import Network.HTTP2.H2.Status
+import Network.HTTP2.H2.Stream
+import Network.HTTP2.H2.StreamTable
+import Network.HTTP2.H2.Types
+import Network.HTTP2.H2.Window
diff --git a/Network/HTTP2/Arch/Config.hs → Network/HTTP2/H2/Config.hs b/Network/HTTP2/Arch/Config.hs → Network/HTTP2/H2/Config.hs
@@ -1,4 +1,4 @@
-module Network.HTTP2.Arch.Config where
+module Network.HTTP2.H2.Config where
 
 import Data.ByteString (ByteString)
 import Data.IORef
@@ -8,8 +8,8 @@ import Network.Socket.ByteString (sendAll)
 import qualified System.TimeManager as T
 
 import Network.HPACK
-import Network.HTTP2.Arch.File
-import Network.HTTP2.Arch.ReadN
+import Network.HTTP2.H2.File
+import Network.HTTP2.H2.ReadN
 
 -- | HTTP/2 configuration.
 data Config = Config

diff --git a/Network/HTTP2/Arch/Context.hs → Network/HTTP2/H2/Context.hs b/Network/HTTP2/Arch/Context.hs → Network/HTTP2/H2/Context.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 
-module Network.HTTP2.Arch.Context where
+module Network.HTTP2.H2.Context where
 
 import Control.Exception
 import Data.IORef
@@ -13,10 +13,10 @@ import UnliftIO.STM
 
 import Imports hiding (insert)
 import Network.HPACK
-import Network.HTTP2.Arch.Rate
-import Network.HTTP2.Arch.Stream
-import Network.HTTP2.Arch.StreamTable
-import Network.HTTP2.Arch.Types
+import Network.HTTP2.H2.Rate
+import Network.HTTP2.H2.Stream
+import Network.HTTP2.H2.StreamTable
+import Network.HTTP2.H2.Types
 import Network.HTTP2.Frame
 
 data Role = Client | Server deriving (Eq, Show)

diff --git a/Network/HTTP2/Arch/EncodeFrame.hs → Network/HTTP2/H2/EncodeFrame.hs b/Network/HTTP2/Arch/EncodeFrame.hs → Network/HTTP2/H2/EncodeFrame.hs
@@ -1,4 +1,4 @@
-module Network.HTTP2.Arch.EncodeFrame where
+module Network.HTTP2.H2.EncodeFrame where
 
 import Network.HTTP2.Frame
 

diff --git a/Network/HTTP2/Arch/File.hs → Network/HTTP2/H2/File.hs b/Network/HTTP2/Arch/File.hs → Network/HTTP2/H2/File.hs
@@ -1,4 +1,4 @@
-module Network.HTTP2.Arch.File where
+module Network.HTTP2.H2.File where
 
 import System.IO
 

diff --git a/Network/HTTP2/Arch/HPACK.hs → Network/HTTP2/H2/HPACK.hs b/Network/HTTP2/Arch/HPACK.hs → Network/HTTP2/H2/HPACK.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 
-module Network.HTTP2.Arch.HPACK (
+module Network.HTTP2.H2.HPACK (
     hpackEncodeHeader,
     hpackEncodeHeaderLoop,
     hpackDecodeHeader,
@@ -17,8 +17,8 @@ import qualified Network.HTTP.Types as H
 import Imports
 import Network.HPACK
 import Network.HPACK.Token
-import Network.HTTP2.Arch.Context
-import Network.HTTP2.Arch.Types
+import Network.HTTP2.H2.Context
+import Network.HTTP2.H2.Types
 import Network.HTTP2.Frame
 
 -- $setup

diff --git a/Network/HTTP2/Arch/Manager.hs → Network/HTTP2/H2/Manager.hs b/Network/HTTP2/Arch/Manager.hs → Network/HTTP2/H2/Manager.hs
@@ -4,7 +4,7 @@
 -- | A thread manager.
 --   The manager has responsibility to spawn and kill
 --   worker threads.
-module Network.HTTP2.Arch.Manager (
+module Network.HTTP2.H2.Manager (
     Manager,
     Action,
     start,

diff --git a/Network/HTTP2/Arch/Queue.hs → Network/HTTP2/H2/Queue.hs b/Network/HTTP2/Arch/Queue.hs → Network/HTTP2/H2/Queue.hs
@@ -1,11 +1,11 @@
 {-# LANGUAGE RecordWildCards #-}
 
-module Network.HTTP2.Arch.Queue where
+module Network.HTTP2.H2.Queue where
 
 import UnliftIO.STM
 
-import Network.HTTP2.Arch.Manager
-import Network.HTTP2.Arch.Types
+import Network.HTTP2.H2.Manager
+import Network.HTTP2.H2.Types
 
 {-# INLINE forkAndEnqueueWhenReady #-}
 forkAndEnqueueWhenReady

diff --git a/Network/HTTP2/Arch/Rate.hs → Network/HTTP2/H2/Rate.hs b/Network/HTTP2/Arch/Rate.hs → Network/HTTP2/H2/Rate.hs
@@ -1,4 +1,4 @@
-module Network.HTTP2.Arch.Rate (
+module Network.HTTP2.H2.Rate (
     Rate,
     newRate,
     getRate,

diff --git a/Network/HTTP2/Arch/ReadN.hs → Network/HTTP2/H2/ReadN.hs b/Network/HTTP2/Arch/ReadN.hs → Network/HTTP2/H2/ReadN.hs
@@ -1,4 +1,4 @@
-module Network.HTTP2.Arch.ReadN where
+module Network.HTTP2.H2.ReadN where
 
 import qualified Data.ByteString as B
 import Data.IORef

diff --git a/Network/HTTP2/Arch/Receiver.hs → Network/HTTP2/H2/Receiver.hs b/Network/HTTP2/Arch/Receiver.hs → Network/HTTP2/H2/Receiver.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE PatternGuards #-}
 {-# LANGUAGE RecordWildCards #-}
 
-module Network.HTTP2.Arch.Receiver (
+module Network.HTTP2.H2.Receiver (
     frameReceiver,
 ) where
 
@@ -18,17 +18,17 @@ import UnliftIO.STM
 import Imports hiding (delete, insert)
 import Network.HPACK
 import Network.HPACK.Token
-import Network.HTTP2.Arch.Config
-import Network.HTTP2.Arch.Context
-import Network.HTTP2.Arch.EncodeFrame
-import Network.HTTP2.Arch.HPACK
-import Network.HTTP2.Arch.Queue
-import Network.HTTP2.Arch.Rate
-import Network.HTTP2.Arch.Settings
-import Network.HTTP2.Arch.Stream
-import Network.HTTP2.Arch.StreamTable
-import Network.HTTP2.Arch.Types
-import Network.HTTP2.Arch.Window
+import Network.HTTP2.H2.Config
+import Network.HTTP2.H2.Context
+import Network.HTTP2.H2.EncodeFrame
+import Network.HTTP2.H2.HPACK
+import Network.HTTP2.H2.Queue
+import Network.HTTP2.H2.Rate
+import Network.HTTP2.H2.Settings
+import Network.HTTP2.H2.Stream
+import Network.HTTP2.H2.StreamTable
+import Network.HTTP2.H2.Types
+import Network.HTTP2.H2.Window
 import Network.HTTP2.Frame
 
 ----------------------------------------------------------------

diff --git a/Network/HTTP2/Arch/Sender.hs → Network/HTTP2/H2/Sender.hs b/Network/HTTP2/Arch/Sender.hs → Network/HTTP2/H2/Sender.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module Network.HTTP2.Arch.Sender (
+module Network.HTTP2.H2.Sender (
     frameSender,
     fillBuilderBodyGetNext,
     fillFileBodyGetNext,
@@ -23,17 +23,17 @@ import UnliftIO.STM
 
 import Imports
 import Network.HPACK (TokenHeaderList, setLimitForEncoding, toHeaderTable)
-import Network.HTTP2.Arch.Config
-import Network.HTTP2.Arch.Context
-import Network.HTTP2.Arch.EncodeFrame
-import Network.HTTP2.Arch.File
-import Network.HTTP2.Arch.HPACK
-import Network.HTTP2.Arch.Manager hiding (start)
-import Network.HTTP2.Arch.Queue
-import Network.HTTP2.Arch.Settings
-import Network.HTTP2.Arch.Stream
-import Network.HTTP2.Arch.Types
-import Network.HTTP2.Arch.Window
+import Network.HTTP2.H2.Config
+import Network.HTTP2.H2.Context
+import Network.HTTP2.H2.EncodeFrame
+import Network.HTTP2.H2.File
+import Network.HTTP2.H2.HPACK
+import Network.HTTP2.H2.Manager hiding (start)
+import Network.HTTP2.H2.Queue
+import Network.HTTP2.H2.Settings
+import Network.HTTP2.H2.Stream
+import Network.HTTP2.H2.Types
+import Network.HTTP2.H2.Window
 import Network.HTTP2.Frame
 
 ----------------------------------------------------------------

diff --git a/Network/HTTP2/Arch/Settings.hs → Network/HTTP2/H2/Settings.hs b/Network/HTTP2/Arch/Settings.hs → Network/HTTP2/H2/Settings.hs
@@ -1,17 +1,17 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RecordWildCards #-}
 
-module Network.HTTP2.Arch.Settings where
+module Network.HTTP2.H2.Settings where
 
 import Data.IORef
 import UnliftIO.STM
 
 import Imports
-import Network.HTTP2.Arch.Config
-import Network.HTTP2.Arch.Context
-import Network.HTTP2.Arch.EncodeFrame
-import Network.HTTP2.Arch.StreamTable
-import Network.HTTP2.Arch.Types
+import Network.HTTP2.H2.Config
+import Network.HTTP2.H2.Context
+import Network.HTTP2.H2.EncodeFrame
+import Network.HTTP2.H2.StreamTable
+import Network.HTTP2.H2.Types
 import Network.HTTP2.Frame
 
 -- max: 2,147,483,647 (2^31-1) is too large.

diff --git a/Network/HTTP2/Arch/Status.hs → Network/HTTP2/H2/Status.hs b/Network/HTTP2/Arch/Status.hs → Network/HTTP2/H2/Status.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Network.HTTP2.Arch.Status (
+module Network.HTTP2.H2.Status (
     getStatus,
     setStatus,
 ) where

diff --git a/Network/HTTP2/Arch/Stream.hs → Network/HTTP2/H2/Stream.hs b/Network/HTTP2/Arch/Stream.hs → Network/HTTP2/H2/Stream.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE RecordWildCards #-}
 
-module Network.HTTP2.Arch.Stream where
+module Network.HTTP2.H2.Stream where
 
 import Control.Exception
 import Control.Monad
@@ -10,8 +10,8 @@ import Data.Maybe (fromMaybe)
 import UnliftIO.Concurrent
 import UnliftIO.STM
 
-import Network.HTTP2.Arch.StreamTable
-import Network.HTTP2.Arch.Types
+import Network.HTTP2.H2.StreamTable
+import Network.HTTP2.H2.Types
 import Network.HTTP2.Frame
 
 ----------------------------------------------------------------

diff --git a/Network/HTTP2/Arch/StreamTable.hs → Network/HTTP2/H2/StreamTable.hs b/Network/HTTP2/Arch/StreamTable.hs → Network/HTTP2/H2/StreamTable.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE RecordWildCards #-}
 
-module Network.HTTP2.Arch.StreamTable (
+module Network.HTTP2.H2.StreamTable (
     -- * Types
     OddStreamTable,
     emptyOddStreamTable,
@@ -40,7 +40,7 @@ import qualified Data.OrdPSQ as PSQ
 import Network.HTTP.Types (Method)
 
 import Imports
-import Network.HTTP2.Arch.Types (Stream (..))
+import Network.HTTP2.H2.Types (Stream (..))
 
 ----------------------------------------------------------------
 

diff --git a/Network/HTTP2/Arch/Types.hs → Network/HTTP2/H2/Types.hs b/Network/HTTP2/Arch/Types.hs → Network/HTTP2/H2/Types.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
 
-module Network.HTTP2.Arch.Types where
+module Network.HTTP2.H2.Types where
 
 import qualified Control.Exception as E
 import Data.ByteString.Builder (Builder)
@@ -16,7 +16,7 @@ import UnliftIO.STM
 
 import Imports
 import Network.HPACK
-import Network.HTTP2.Arch.File
+import Network.HTTP2.H2.File
 import Network.HTTP2.Frame
 
 ----------------------------------------------------------------