From 844f944ce47d3d2eeef84944d2c73e0681df0e49 Mon Sep 17 00:00:00 2001
From: Steven Le Rouzic <steven.lerouzic@gmail.com>
Date: Mon, 17 Feb 2025 23:41:53 +0100
Subject: Upgrade asl

---
 MODULE.bazel                   | 2 +-
 MODULE.bazel.lock              | 2 +-
 hk21/game/BUILD.bazel          | 8 ++++++--
 hk21/game/gpu.cpp              | 8 ++++----
 hk21/game/gpu.hpp              | 4 ++--
 hk21/game/main.cpp             | 2 +-
 hk21/vulkan_loader/BUILD.bazel | 3 ++-
 hk21/vulkan_loader/api.hpp     | 4 ++--
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index fe49455..d66d815 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -15,7 +15,7 @@ bazel_dep(name = "sdl3_windows", version = "3.2.0")
 bazel_dep(name = "asl")
 git_override(
     module_name = "asl",
-    commit = "3d5a45b283d2a59211f9e24f100b95169375213d",
+    commit = "a141c401f78467bc15f62882fca5d55a007cacbb",
     remote = "https://git.stevenlr.com/460nm/asl.git/",
 )
 
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index 8f513e7..7c08156 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1,5 +1,5 @@
 {
-  "lockFileVersion": 16,
+  "lockFileVersion": 18,
   "registryFileHashes": {
     "https://bcr.bazel.build/bazel_registry.json": "8a28e4aff06ee60aed2a8c281907fb8bcbf3b753c91fb5a5c57da3215d5b3497",
     "https://bcr.bazel.build/modules/abseil-cpp/20210324.2/MODULE.bazel": "7cd0312e064fde87c8d1cd79ba06c876bd23630c83466e9500321be55c96ace2",
diff --git a/hk21/game/BUILD.bazel b/hk21/game/BUILD.bazel
index b2cca09..786ed6a 100644
--- a/hk21/game/BUILD.bazel
+++ b/hk21/game/BUILD.bazel
@@ -6,8 +6,12 @@ cc_binary(
         "gpu.hpp",
     ],
     deps = [
-        "@asl//asl",
-        "@asl//asl/log",
+        "@asl//asl/base",
+        "@asl//asl/logging",
+        "@asl//asl/types:status",
+        "@asl//asl/types:box",
+        "@asl//asl/types:option",
+        "@asl//asl/containers:buffer",
         "@sdl3_windows//:sdl3",
         "//hk21/vulkan_loader",
     ],
diff --git a/hk21/game/gpu.cpp b/hk21/game/gpu.cpp
index 3fe0a8b..b481ee7 100644
--- a/hk21/game/gpu.cpp
+++ b/hk21/game/gpu.cpp
@@ -1,9 +1,9 @@
 #include "hk21/game/gpu.hpp"
 
-#include <asl/buffer.hpp>
-#include <asl/format.hpp>
-#include <asl/option.hpp>
-#include <asl/log/log.hpp>
+#include <asl/containerS/buffer.hpp>
+#include <asl/formatting/format.hpp>
+#include <asl/types/option.hpp>
+#include <asl/logging/logging.hpp>
 
 #include <SDL3/SDL_vulkan.h>
 
diff --git a/hk21/game/gpu.hpp b/hk21/game/gpu.hpp
index fb74e20..d8d9d18 100644
--- a/hk21/game/gpu.hpp
+++ b/hk21/game/gpu.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <asl/status_or.hpp>
-#include <asl/box.hpp>
+#include <asl/types/status_or.hpp>
+#include <asl/types/box.hpp>
 
 struct SDL_Window;
 
diff --git a/hk21/game/main.cpp b/hk21/game/main.cpp
index ed4c738..21b17f3 100644
--- a/hk21/game/main.cpp
+++ b/hk21/game/main.cpp
@@ -1,4 +1,4 @@
-#include <asl/log/log.hpp>
+#include <asl/logging/logging.hpp>
 
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
diff --git a/hk21/vulkan_loader/BUILD.bazel b/hk21/vulkan_loader/BUILD.bazel
index 8aa55a1..9cd37f4 100644
--- a/hk21/vulkan_loader/BUILD.bazel
+++ b/hk21/vulkan_loader/BUILD.bazel
@@ -9,7 +9,8 @@ cc_library(
     ],
     deps = [
         "//vendor/vulkan",
-        "@asl//asl",
+        "@asl//asl/base",
+        "@asl//asl/types:status",
     ],
     visibility = ["//:__subpackages__"],
 )
diff --git a/hk21/vulkan_loader/api.hpp b/hk21/vulkan_loader/api.hpp
index 06e447a..c858a6c 100644
--- a/hk21/vulkan_loader/api.hpp
+++ b/hk21/vulkan_loader/api.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <asl/integers.hpp>
-#include <asl/status.hpp>
+#include <asl/base/integers.hpp>
+#include <asl/types/status.hpp>
 
 #define VK_NO_STDDEF_H
 #define VK_NO_STDINT_H
-- 
cgit