message: relocate from container
Some checks failed
Test / Create distribution (push) Failing after 30s
Test / Hakurei (push) Failing after 49s
Test / Sandbox (race detector) (push) Failing after 49s
Test / Sandbox (push) Failing after 52s
Test / Hpkg (push) Failing after 57s
Test / Hakurei (race detector) (push) Failing after 1m5s
Test / Flake checks (push) Has been skipped

This package is quite useful. This change allows it to be imported without importing container.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2025-10-09 05:04:08 +09:00
parent df9b77b077
commit 01fedddbff
42 changed files with 198 additions and 174 deletions

View File

@@ -6,6 +6,7 @@ import (
"os"
"hakurei.app/container"
"hakurei.app/message"
)
// OpError is returned by [I.Commit] and [I.Revert].
@@ -70,14 +71,14 @@ func printJoinedError(println func(v ...any), fallback string, err error) {
error
}
if !errors.As(err, &joinErr) {
if m, ok := container.GetErrorMessage(err); ok {
if m, ok := message.GetMessage(err); ok {
println(m)
} else {
println(fallback, err)
}
} else {
for _, err = range joinErr.Unwrap() {
if m, ok := container.GetErrorMessage(err); ok {
if m, ok := message.GetMessage(err); ok {
println(m)
} else {
println(err.Error())