karm-base: Move panic() back in.

skift-org · Apr 19, 2024 · 54fbda8 · 54fbda8
1 parent 7813e4c
commit 54fbda8
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 15 deletions.
diff --git a/src/impls/impl-posix/entry.cpp b/src/impls/impl-posix/entry.cpp
@@ -1,4 +1,4 @@
-#include <karm-panic/panic.h>
+#include <karm-base/panic.h>
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/src/impls/impl-skift/main.cpp b/src/impls/impl-skift/main.cpp
@@ -1,8 +1,8 @@
 #include <abi-sysv/abi.h>
 #include <handover/hook.h>
 #include <hjert-api/api.h>
+#include <karm-base/panic.h>
 #include <karm-logger/logger.h>
-#include <karm-panic/panic.h>
 #include <karm-sys/context.h>
 
 #include "hooks.h"

diff --git a/src/libs/karm-base/any.h b/src/libs/karm-base/any.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <karm-meta/id.h>
-#include <karm-panic/panic.h>
+
+#include "panic.h"
 
 namespace Karm {
 

diff --git a/src/libs/karm-base/error.h b/src/libs/karm-base/error.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <karm-panic/panic.h>
-
 #include "cstr.h"
+#include "panic.h"
 #include "std.h"
 #include "try.h"
 

diff --git a/src/libs/karm-base/manifest.json b/src/libs/karm-base/manifest.json
@@ -5,7 +5,6 @@
     "description": "Base data types and functions",
     "requires": [
         "karm-meta",
-        "karm-panic",
         "stdc-math",
         "stdc-ansi",
         "stdcpp"

diff --git a/src/libs/karm-base/opt.h b/src/libs/karm-base/opt.h
@@ -2,9 +2,9 @@
 
 #include <karm-meta/callable.h>
 #include <karm-meta/traits.h>
-#include <karm-panic/panic.h>
 
 #include "macros.h"
+#include "panic.h"
 #include "try.h"
 
 namespace Karm {

diff --git a/src/libs/karm-panic/panic.cpp → src/libs/karm-base/panic.cpp b/src/libs/karm-panic/panic.cpp → src/libs/karm-base/panic.cpp
diff --git a/src/libs/karm-panic/panic.h → src/libs/karm-base/panic.h b/src/libs/karm-panic/panic.h → src/libs/karm-base/panic.h
diff --git a/src/libs/karm-base/ring.h b/src/libs/karm-base/ring.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <karm-panic/panic.h>
-
 #include "inert.h"
+#include "panic.h"
 
 namespace Karm {
 

diff --git a/src/libs/karm-panic/manifest.json b/src/libs/karm-panic/manifest.json