message: relocate from container
All checks were successful
Test / Create distribution (push) Successful in 35s
Test / Sandbox (push) Successful in 2m22s
Test / Hpkg (push) Successful in 4m2s
Test / Sandbox (race detector) (push) Successful in 4m28s
Test / Hakurei (race detector) (push) Successful in 5m21s
Test / Hakurei (push) Successful in 2m9s
Test / Flake checks (push) Successful in 1m29s
All checks were successful
Test / Create distribution (push) Successful in 35s
Test / Sandbox (push) Successful in 2m22s
Test / Hpkg (push) Successful in 4m2s
Test / Sandbox (race detector) (push) Successful in 4m28s
Test / Hakurei (race detector) (push) Successful in 5m21s
Test / Hakurei (push) Successful in 2m9s
Test / Flake checks (push) Successful in 1m29s
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:
@@ -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())
|
||||
|
||||
Reference in New Issue
Block a user