Bump API version to v1.3.273 (#576)

* Bump to .272 and fix huawei var leak
* Bump API version to v1.3.273

Author: dpwiz

changelog.md

@@ -2,6 +2,10 @@
 
 ## WIP
 
+## [3.26.4] - 2025-05-31
+
+- Bump API version to v1.3.273
+
 ## [3.26.3] - 2025-05-18
 
 - Bump API version to v1.3.271

generate-new/Vulkan-Docs

@@ -35,7 +35,7 @@ import           Render.Element
 import           Render.SpecInfo                ( HasSpecInfo
                                                 , SpecInfo(..)
                                                 )
-import           Render.Type                    ( cToHsType )
+import           Render.Type                    ( cToHsTypeWithHoles )
 import           Render.Type.Preserve           ( Preserve(DoNotPreserve) )
 import           Render.Names
 import           Spec.Types
@@ -94,6 +94,7 @@ renderSPIRVThing
      , HasSpecInfo r
      , HasMarshalledStructs r
      , HasRenderedNames r
+     , HasCallStack
      )
   => Text
   -> (a -> Text)
@@ -129,6 +130,7 @@ renderReq
      , HasSpecInfo r
      , HasMarshalledStructs r
      , HasRenderedNames r
+     , HasCallStack
      )
   => SPIRVRequirement
   -> Sem r ([Doc ()], [Doc ()])
@@ -142,8 +144,12 @@ renderReq = \case
     tellImportWithAll (mkName "Vulkan.Requirement.DeviceRequirement")
     tellImportWithAll (mkName "Vulkan.Requirement.InstanceRequirement")
     tellLanguageExtension (LanguageExtension "OverloadedLists")
-    sTy <- cToHsType DoNotPreserve (TypeName s)
-    -- TODO: this is pretty lazy, import the accessors properly
+    -- Use the "holes" style (wildcard for extensible suffix) to avoid
+    -- introducing fresh type variables that violate runNoContext when the
+    -- struct is further extended (e.g. the new
+    -- VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI extending
+    -- VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI).
+    sTy <- cToHsTypeWithHoles DoNotPreserve (TypeName s)
     traverse_ tellImportWithAll (allTypeNames sTy)
     (otherInstReqs, otherDevReqs) <- minVersionAndExtensionsReqs rs
     getStruct                     <- input
@@ -200,8 +206,9 @@ renderReq = \case
     tellImportWithAll (mkName "Vulkan.Requirement.DeviceRequirement")
     tellImportWithAll (mkName "Vulkan.Requirement.InstanceRequirement")
     tellLanguageExtension (LanguageExtension "OverloadedLists")
-    -- TODO: this is pretty lazy, import the accessors properly
-    sTy <- cToHsType DoNotPreserve (TypeName p)
+    -- Same reasoning as above: employ the wildcard-hole variation for
+    -- extensible structs so that no additional type variables leak out.
+    sTy <- cToHsTypeWithHoles DoNotPreserve (TypeName p)
     traverse_ tellImportWithAll (allTypeNames sTy)
     sTyDoc <- renderType sTy
     let propertyMemberName = mkMemberName p m

generate-new/khronos-spec/Khronos/SPIRVElements.hs

@@ -285,7 +285,7 @@ renderModule out boot getDoc findModule findLocalModule (Segment modName unsorte
         let t = layoutDoc (d <> line <> line)
         if getAll (reCanFormat e)
           then
-            liftIO (try (Ormolu.ormolu ormoluConfig "<stdin>" (T.unpack t)))
+            liftIO (try (Ormolu.ormolu ormoluConfig "<stdin>" $ T.unpack t))
               >>= \case
                     Left ex ->
                       error
@@ -456,7 +456,7 @@ readFileMaybe :: FilePath -> IO (Maybe Text)
 readFileMaybe f =
   (Just <$> T.readFile f) `catch` (\(_ :: IOException) -> pure Nothing)
 
--- If we don't put PatternSynonyms here the fourmolu eatst he comments on them 
+-- If we don't put PatternSynonyms here the fourmolu eatst he comments on them
 ormoluConfig :: Ormolu.Config Ormolu.RegionIndices
 ormoluConfig = Ormolu.defaultConfig
   { Ormolu.cfgDynOptions  = [Ormolu.DynOption "-XPatternSynonyms"]

generate-new/src/Render/Element/Write.hs

@@ -1,5 +1,7 @@
-{-# language TemplateHaskellQuotes #-}
+{-# language NamedFieldPuns #-}
 {-# language NoStarIsType #-}
+{-# language TemplateHaskellQuotes #-}
+
 module Render.Type
   ( Preserve(..)
   , ExtensibleStructStyle(..)
@@ -15,6 +17,7 @@ module Render.Type
   , ConstrainedVar(..)
   ) where
 
+import qualified Data.List as L
 import qualified Data.Text                     as T
 import qualified Data.Vector                   as V
 import           Foreign.C.Types
@@ -48,7 +51,7 @@ import           Spec.Types
 -- | The same as 'cToHsType' except type variables are written as @_@
 cToHsTypeWithHoles
   :: forall r
-   . (HasErr r, HasRenderParams r, HasSpecInfo r)
+   . (HasErr r, HasRenderParams r, HasSpecInfo r, HasCallStack)
   => Preserve
   -> CType
   -> Sem r H.Type
@@ -57,7 +60,7 @@ cToHsTypeWithHoles = runNoContext .: cToHsType' UnwrappedHole
 -- | The same as 'cToHsType' except extensible structs are wrapped in @SomeStruct@
 cToHsTypeWrapped
   :: forall r
-   . (HasErr r, HasRenderParams r, HasSpecInfo r)
+   . (HasErr r, HasRenderParams r, HasSpecInfo r, HasCallStack)
   => Preserve
   -> CType
   -> Sem r H.Type
@@ -85,7 +88,7 @@ cToHsTypeWithContext = cToHsType' Unwrapped
 
 cToHsType
   :: forall r
-   . (HasErr r, HasRenderParams r, HasSpecInfo r)
+   . (HasErr r, HasRenderParams r, HasSpecInfo r, HasCallStack)
   => Preserve
   -> CType
   -> Sem r H.Type
@@ -212,6 +215,7 @@ data ContextState = ContextState
   , csPositiveVars :: [ConstrainedVar]
   , csNextVars     :: [Name]
   }
+  deriving (Show)
 
 type HasContextState r = Member (State ContextState) r
 
@@ -251,13 +255,17 @@ runRenderTypeContext a = do
   (s, r) <- runState initialContextState a
   pure (reverse (csNegativeVars s), reverse (csPositiveVars s), r)
 
-runNoContext :: HasErr r => Sem (State ContextState : r) a -> Sem r a
+runNoContext :: (HasErr r, HasCallStack) => Sem (State ContextState : r) a -> Sem r a
 runNoContext a = do
-  (s, r) <- runState initialContextState a
-  if null (csNegativeVars s <> csPositiveVars s)
-    then pure ()
-    else throw "Variables were inserted while getting the type with no context"
-  pure r
+  (ContextState{csNegativeVars, csPositiveVars}, r) <- runState initialContextState a
+  if null (csNegativeVars <> csPositiveVars)
+    then pure r
+    else throw . fromString $ L.unlines
+      [ "Variables were inserted while getting the type with no context:"
+      , '-' : show csNegativeVars
+      , '+' : show csPositiveVars
+      , prettyCallStack callStack
+      ]
 
 ----------------------------------------------------------------
 -- Utils

generate-new/src/Render/Type.hs

@@ -3,6 +3,8 @@ module Render.Type.Preserve where
 import           Language.Haskell.TH            ( Name
                                                 , Type
                                                 )
+import           Prelude (Show)
+
 data Preserve
   = DoNotPreserve
     -- ^ Use more idiomatic haskell types
@@ -27,3 +29,4 @@ data ConstrainedVar
   = Extends {cVarBase :: Type, cVarName :: Name}
   | Inherits {cVarBase :: Type, cVarName :: Name}
   | Unconstrained {cVarName :: Name}
+  deriving (Show)

generate-new/src/Render/Type/Preserve.hs

@@ -1,5 +1,5 @@
 name: vulkan
-version: "3.26.3"
+version: "3.26.4"
 synopsis: Bindings to the Vulkan graphics API.
 description: Please see [the readme](https://github.com/expipiplus1/vulkan/#readme)
 category: Graphics