Skip to content

Commit

Permalink
meta: Fixup how clang format order includes.
Browse files Browse the repository at this point in the history
  • Loading branch information
sleepy-monax committed Dec 22, 2024
1 parent d685eec commit 834f0de
Show file tree
Hide file tree
Showing 49 changed files with 31 additions and 78 deletions.
4 changes: 2 additions & 2 deletions src/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ SeparateDefinitionBlocks: Always

IncludeBlocks: Regroup
IncludeCategories:
- Regex: '<[[:alnum:].\/-]+>'
- Regex: '<.*>'
Priority: 0
SortPriority: 0
- Regex: '"[[:alnum:].\/-]+"'
- Regex: '".*"'
Priority: 10
SortPriority: 10
1 change: 0 additions & 1 deletion src/apps/hideo-demos/base.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include <karm-ui/node.h>

#include <mdi/_prelude.h>

namespace Hideo::Demos {
Expand Down
1 change: 0 additions & 1 deletion src/apps/hideo-zoo/model.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include <karm-ui/reducer.h>

#include <mdi/_prelude.h>

namespace Hideo::Zoo {
Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-darwin/async.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
#include <impl-posix/fd.h>
#include <impl-posix/utils.h>
#include <karm-base/map.h>
#include <karm-sys/_embed.h>
#include <karm-sys/async.h>
#include <karm-sys/time.h>

#include <karm-sys/_embed.h>

namespace Karm::Sys::_Embed {

struct DarwinSched :
Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-efi/app.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@


#include <karm-app/prefs.h>

#include <karm-app/_embed.h>
#include <karm-app/prefs.h>

namespace Karm::App::_Ember {

Expand Down
1 change: 0 additions & 1 deletion src/impls/impl-efi/base.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include <efi/base.h>
#include <efi/spec.h>

#include <karm-base/_embed.h>

namespace Karm::_Embed {
Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-efi/logger.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include <karm-sys/chan.h>

#include <karm-logger/_embed.h>
#include <karm-sys/chan.h>

namespace Karm::Logger::_Embed {

Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-efi/sys.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
#include <karm-io/impls.h>
#include <karm-json/parse.h>
#include <karm-logger/logger.h>
#include <karm-sys/_embed.h>
#include <karm-sys/file.h>
#include <karm-sys/launch.h>

#include <karm-sys/_embed.h>

namespace Karm::Sys::_Embed {

static TimeStamp fromEfi(Efi::Time time) {
Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-efi/ui.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include <efi/base.h>
#include <karm-ui/drag.h>

#include <karm-ui/_embed.h>
#include <karm-ui/drag.h>

namespace Karm::Ui::_Embed {

Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-hjert/logger.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#include <hjert-core/arch.h>
#include <karm-base/lock.h>
#include <karm-sys/chan.h>

#include <karm-logger/_embed.h>
#include <karm-sys/chan.h>

namespace Karm::Logger::_Embed {

Expand Down
5 changes: 2 additions & 3 deletions src/impls/impl-posix/app.cpp
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#include <karm-app/_embed.h>
#include <karm-app/prefs.h>
#include <karm-json/parse.h>
#include <karm-logger/logger.h>
#include <karm-mime/url.h>
#include <karm-pkg/_embed.h>
#include <karm-sys/dir.h>
#include <karm-sys/file.h>

#include <karm-app/_embed.h>
#include <karm-pkg/_embed.h>

namespace Karm::App::_Ember {

struct XdgConfigPrefs : public Prefs {
Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-posix/base.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#include <execinfo.h>
#include <karm-base/_embed.h>
#include <karm-base/backtrace.h>
#include <karm-io/aton.h>
#include <stdio.h>
#include <stdlib.h>

#include <karm-base/_embed.h>

namespace Karm::_Embed {

// MARK: Backtrace -------------------------------------------------------------
Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-posix/logger.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include <karm-sys/chan.h>

#include <karm-logger/_embed.h>
#include <karm-sys/chan.h>

namespace Karm::Logger::_Embed {

Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-posix/sys.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
//
#include <karm-io/funcs.h>
#include <karm-logger/logger.h>
#include <karm-sys/_embed.h>
#include <karm-sys/launch.h>
#include <karm-sys/proc.h>

#include <karm-sys/_embed.h>

#include "fd.h"
#include "utils.h"

Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-sdl/ui.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#include <SDL.h>
#include <karm-image/loader.h>
#include <karm-pkg/bundle.h>
#include <karm-ui/drag.h>

#include <karm-ui/_embed.h>
#include <karm-ui/drag.h>

namespace Karm::Ui::_Embed {

Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-skift/app.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@


#include <karm-app/prefs.h>

#include <karm-app/_embed.h>
#include <karm-app/prefs.h>

namespace Karm::App::_Ember {

Expand Down
1 change: 0 additions & 1 deletion src/impls/impl-skift/async.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include <hjert-api/api.h>
#include <karm-base/map.h>
#include <karm-logger/logger.h>

#include <karm-sys/_embed.h>

#include "fd.h"
Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-skift/logger.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include <hjert-api/api.h>
#include <karm-sys/chan.h>

#include <karm-logger/_embed.h>
#include <karm-sys/chan.h>

namespace Karm::Logger::_Embed {

Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-skift/sys.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#include <handover/hook.h>
#include <hjert-api/api.h>
#include <karm-logger/logger.h>
#include <karm-sys/launch.h>

#include <karm-sys/_embed.h>
#include <karm-sys/launch.h>

#include "fd.h"

Expand Down
1 change: 0 additions & 1 deletion src/impls/impl-skift/ui.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include <hjert-api/api.h>

#include <karm-ui/_embed.h>

namespace Karm::Ui::_Embed {
Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-uring/async.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
#include <impl-posix/utils.h>
#include <karm-base/map.h>
#include <karm-logger/logger.h>
#include <karm-sys/_embed.h>
#include <karm-sys/async.h>
#include <karm-sys/time.h>

#include <karm-sys/_embed.h>

namespace Karm::Sys::_Embed {

struct __kernel_timespec toKernelTimespec(TimeStamp ts) {
Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-wasm/app.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@


#include <karm-app/prefs.h>

#include <karm-app/_embed.h>
#include <karm-app/prefs.h>

namespace Karm::App::_Ember {

Expand Down
3 changes: 1 addition & 2 deletions src/impls/impl-wasm/logger.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include <karm-sys/chan.h>

#include <karm-logger/_embed.h>
#include <karm-sys/chan.h>

namespace Karm::Logger::_Embed {

Expand Down
1 change: 0 additions & 1 deletion src/impls/impl-wasm/sys.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#include <karm-base/res.h>
#include <karm-base/time.h>
#include <karm-logger/logger.h>

#include <karm-sys/_embed.h>

#include "externs.h"
Expand Down
17 changes: 8 additions & 9 deletions src/kernel/hjert-x86_64/arch.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
#include <hal-x86_64/com.h>
#include <hal-x86_64/gdt.h>
#include <hal-x86_64/idt.h>
#include <hal-x86_64/pic.h>
#include <hal-x86_64/pit.h>
#include <hal-x86_64/simd.h>
#include <hal-x86_64/sys.h>
#include <hal-x86_64/vmm.h>
#include <hjert-core/arch.h>
#include <hjert-core/cpu.h>
#include <hjert-core/irq.h>
Expand All @@ -8,15 +16,6 @@
#include <hjert-core/task.h>
#include <karm-base/witty.h>

#include <hal-x86_64/com.h>
#include <hal-x86_64/gdt.h>
#include <hal-x86_64/idt.h>
#include <hal-x86_64/pic.h>
#include <hal-x86_64/pit.h>
#include <hal-x86_64/simd.h>
#include <hal-x86_64/sys.h>
#include <hal-x86_64/vmm.h>

#include "ints.h"

namespace Hjert::Arch {
Expand Down
3 changes: 1 addition & 2 deletions src/kernel/opstart-efi/fw.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#include <efi/base.h>
#include <hal-x86_64/vmm.h>
#include <karm-base/align.h>
#include <opstart/fw.h>

#include <hal-x86_64/vmm.h>

namespace Opstart::Fw {

struct EfiPmm : public Hal::Pmm {
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-base/base.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <karm-meta/traits.h>

#include "_prelude.h"

#include "macros.h"

namespace Karm {
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-base/lock.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <karm-meta/nocopy.h>

#include "_embed.h"

#include "atomic.h"
#include "string.h"

Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-gfx/icon.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include <karm-math/rect.h>

#include <mdi/_prelude.h>

#include "canvas.h"
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-io/pack.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <karm-base/vec.h>
#include <karm-meta/nocopy.h>
#include <karm-meta/visit.h>

#include <karm-sys/_handle.h>

#include "bscan.h"
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-mime/mime.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <karm-io/emit.h>
#include <karm-io/expr.h>
#include <karm-io/sscan.h>

#include <mdi/_prelude.h>

namespace Karm::Mime {
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-sys/async.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include <karm-logger/logger.h>

#include "_embed.h"

#include "async.h"

namespace Karm::Sys {
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-sys/chan.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include <karm-io/fmt.h>
#include <karm-io/traits.h>

#include <karm-sys/_embed.h>

#include "fd.h"
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-sys/dir.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "dir.h"

#include "_embed.h"

#include "proc.h"

namespace Karm::Sys {
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-sys/file.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "file.h"

#include "_embed.h"

#include "proc.h"

namespace Karm::Sys {
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-sys/info.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "info.h"

#include "_embed.h"

#include "proc.h"

namespace Karm::Sys {
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-sys/launch.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "launch.h"

#include "_embed.h"

#include "proc.h"

namespace Karm::Sys {
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-sys/mmap.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include <karm-io/traits.h>

#include <karm-sys/_embed.h>

#include "types.h"
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-sys/pipe.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "pipe.h"

#include "_embed.h"

#include "proc.h"

namespace Karm::Sys {
Expand Down
1 change: 0 additions & 1 deletion src/libs/karm-sys/proc.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "_embed.h"

#include "time.h"

namespace Karm::Sys {
Expand Down
Loading

0 comments on commit 834f0de

Please sign in to comment.