internal/rosa: use type P in helper interface

This is easier to type and serialises correctly.

Signed-off-by: Ophestra <cat@gensokyo.uk>

6 files changed, 9 insertions, 11 deletions

diff --git a/internal/rosa/cmake.go b/internal/rosa/cmake.go
index f6f29d3e..de672120 100644
--- a/internal/rosa/cmake.go
+++ b/internal/rosa/cmake.go
@@ -144,11 +144,11 @@ func (attr *CMakeHelper) name(name, version string) string {
 }
 
 // extra returns a hardcoded slice of [CMake] and [Ninja].
-func (attr *CMakeHelper) extra(int) []PArtifact {
+func (attr *CMakeHelper) extra(int) P {
 	if attr != nil && attr.Make {
-		return []PArtifact{CMake, Make}
+		return P{CMake, Make}
 	}
-	return []PArtifact{CMake, Ninja}
+	return P{CMake, Ninja}
 }
 
 // wantsChmod returns false.
diff --git a/internal/rosa/dbus.go b/internal/rosa/dbus.go
index f2cb5ff6..ad81f973 100644
--- a/internal/rosa/dbus.go
+++ b/internal/rosa/dbus.go
@@ -36,7 +36,7 @@ func init() {
 		Description: "a message bus system",
 		Website:     "https://www.freedesktop.org/wiki/Software/dbus/",
 
-		Dependencies: []PArtifact{
+		Dependencies: P{
 			GLib,
 			Libexpat,
 		},
diff --git a/internal/rosa/make.go b/internal/rosa/make.go
index 3930c3c3..dd795c82 100644
--- a/internal/rosa/make.go
+++ b/internal/rosa/make.go
@@ -84,8 +84,8 @@ func (*MakeHelper) name(name, version string) string {
 }
 
 // extra returns make and other optional dependencies.
-func (attr *MakeHelper) extra(flag int) []PArtifact {
-	extra := []PArtifact{Make}
+func (attr *MakeHelper) extra(flag int) P {
+	extra := P{Make}
 	if (attr == nil || !attr.OmitDefaults) && flag&TEarly == 0 {
 		extra = append(extra,
 			Gawk,
diff --git a/internal/rosa/meson.go b/internal/rosa/meson.go
index 61317604..946c8044 100644
--- a/internal/rosa/meson.go
+++ b/internal/rosa/meson.go
@@ -72,9 +72,7 @@ func (*MesonHelper) name(name, version string) string {
 }
 
 // extra returns hardcoded meson runtime dependencies.
-func (*MesonHelper) extra(int) []PArtifact {
-	return []PArtifact{Meson}
-}
+func (*MesonHelper) extra(int) P { return P{Meson} }
 
 // wantsChmod returns false.
 func (*MesonHelper) wantsChmod() bool { return false }
diff --git a/internal/rosa/perl.go b/internal/rosa/perl.go
index e26b9c21..65257d35 100644
--- a/internal/rosa/perl.go
+++ b/internal/rosa/perl.go
@@ -135,7 +135,7 @@ func (t Toolchain) newViaPerlMakeMaker(
 			{"PREFIX", "/system"},
 		},
 		Check: []string{"test"},
-	}, slices.Concat(extra, []PArtifact{
+	}, slices.Concat(extra, P{
 		Perl,
 	})...)
 }
diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go
index 3b05b368..5fa7f7e2 100644
--- a/internal/rosa/rosa.go
+++ b/internal/rosa/rosa.go
@@ -409,7 +409,7 @@ type Helper interface {
 	// name returns the value passed to the name argument of [Toolchain.New].
 	name(name, version string) string
 	// extra returns helper-specific dependencies.
-	extra(flag int) []PArtifact
+	extra(flag int) P
 
 	// wantsChmod returns whether the source directory should be made writable.
 	wantsChmod() bool