From a91920310d20e1fc472dea044fce8fd9438835df Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 15 Nov 2025 13:47:09 +0900 Subject: internal: relocate packages Signed-off-by: Ophestra --- system/acl/deprecated.go | 6 +++--- system/dbus/deprecated.go | 20 ++++++++++---------- system/wayland/deprecated.go | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'system') diff --git a/system/acl/deprecated.go b/system/acl/deprecated.go index 4119057b..1981eb72 100644 --- a/system/acl/deprecated.go +++ b/system/acl/deprecated.go @@ -1,4 +1,4 @@ -// Package acl exposes the internal/system/acl package. +// Package acl exposes the internal/acl package. // // Deprecated: This package will be removed in 0.4. package acl @@ -6,7 +6,7 @@ package acl import ( _ "unsafe" // for go:linkname - "hakurei.app/internal/system/acl" + "hakurei.app/internal/acl" ) type Perm = acl.Perm @@ -19,7 +19,7 @@ const ( // Update replaces ACL_USER entry with qualifier uid. // -//go:linkname Update hakurei.app/internal/system/acl.Update +//go:linkname Update hakurei.app/internal/acl.Update func Update(name string, uid int, perms ...Perm) error type Perms = acl.Perms diff --git a/system/dbus/deprecated.go b/system/dbus/deprecated.go index 67a309c2..8f8a6695 100644 --- a/system/dbus/deprecated.go +++ b/system/dbus/deprecated.go @@ -1,4 +1,4 @@ -// Package dbus exposes the internal/system/dbus package. +// Package dbus exposes the internal/dbus package. // // Deprecated: This package will be removed in 0.4. package dbus @@ -9,7 +9,7 @@ import ( _ "unsafe" // for go:linkname "hakurei.app/hst" - "hakurei.app/internal/system/dbus" + "hakurei.app/internal/dbus" "hakurei.app/message" ) @@ -17,13 +17,13 @@ type AddrEntry = dbus.AddrEntry // EqualAddrEntries returns whether two slices of [AddrEntry] are equal. // -//go:linkname EqualAddrEntries hakurei.app/internal/system/dbus.EqualAddrEntries +//go:linkname EqualAddrEntries hakurei.app/internal/dbus.EqualAddrEntries func EqualAddrEntries(entries, target []AddrEntry) bool // Parse parses D-Bus address according to // https://dbus.freedesktop.org/doc/dbus-specification.html#addresses // -//go:linkname Parse hakurei.app/internal/system/dbus.Parse +//go:linkname Parse hakurei.app/internal/dbus.Parse func Parse(addr []byte) ([]AddrEntry, error) type ParseError = dbus.ParseError @@ -46,12 +46,12 @@ type ProxyPair = dbus.ProxyPair // Args returns the xdg-dbus-proxy arguments equivalent of [hst.BusConfig]. // -//go:linkname Args hakurei.app/internal/system/dbus.Args +//go:linkname Args hakurei.app/internal/dbus.Args func Args(c *hst.BusConfig, bus ProxyPair) (args []string) // NewConfig returns the address of a new [hst.BusConfig] with optional defaults. // -//go:linkname NewConfig hakurei.app/internal/system/dbus.NewConfig +//go:linkname NewConfig hakurei.app/internal/dbus.NewConfig func NewConfig(id string, defaults, mpris bool) *hst.BusConfig const ( @@ -89,13 +89,13 @@ const ( // Address returns the session and system bus addresses copied from environment, // or appropriate fallback values if they are not set. // -//go:linkname Address hakurei.app/internal/system/dbus.Address +//go:linkname Address hakurei.app/internal/dbus.Address func Address() (session, system string) // ProxyName is the file name or path to the proxy program. // Overriding ProxyName will only affect Proxy instance created after the change. // -//go:linkname ProxyName hakurei.app/internal/system/dbus.ProxyName +//go:linkname ProxyName hakurei.app/internal/dbus.ProxyName var ProxyName string // Proxy holds the state of a xdg-dbus-proxy process, and should never be copied. @@ -106,10 +106,10 @@ type Final = dbus.Final // Finalise creates a checked argument writer for [Proxy]. // -//go:linkname Finalise hakurei.app/internal/system/dbus.Finalise +//go:linkname Finalise hakurei.app/internal/dbus.Finalise func Finalise(sessionBus, systemBus ProxyPair, session, system *hst.BusConfig) (final *Final, err error) // New returns a new instance of [Proxy]. // -//go:linkname New hakurei.app/internal/system/dbus.New +//go:linkname New hakurei.app/internal/dbus.New func New(ctx context.Context, msg message.Msg, final *Final, output io.Writer) *Proxy diff --git a/system/wayland/deprecated.go b/system/wayland/deprecated.go index bf364d9a..e83c9107 100644 --- a/system/wayland/deprecated.go +++ b/system/wayland/deprecated.go @@ -1,4 +1,4 @@ -// Package wayland exposes the internal/system/wayland package. +// Package wayland exposes the internal/wayland package. // // Deprecated: This package will be removed in 0.4. package wayland @@ -6,7 +6,7 @@ package wayland import ( _ "unsafe" // for go:linkname - "hakurei.app/internal/system/wayland" + "hakurei.app/internal/wayland" ) // Conn represents a connection to the wayland display server. -- cgit v1.3.1