Fix merge conflicts with fs naming

src/core/subrepo.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"fmt"
-	"io/fs"
+	iofs "io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -19,7 +19,7 @@ type Subrepo struct {
 	// The root directory to load it from.
 	Root string
 	// A file system rooted at the subrepo's root directory.
-	FS fs.FS
+	FS iofs.FS
 	// A root directory for outputs of this subrepo's targets
 	PackageRoot string
 	// If this repo is output by a target, this is the target that creates it. Can be nil.

src/help/help.go

@@ -3,7 +3,7 @@ package help
 
 import (
 	"fmt"
-	"io/fs"
+	iofs "io/fs"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -236,7 +236,7 @@ func getPluginBuildDefs(subrepo *core.Subrepo) map[string]*asp.Statement {
 	p := asp.NewParser(subrepo.State)
 	ret := make(map[string]*asp.Statement)
 	for _, dir := range dirs {
-		dirEntries, err := fs.ReadDir(subrepo.FS, dir)
+		dirEntries, err := iofs.ReadDir(subrepo.FS, dir)
 		if err != nil {
 			log.Warningf("Failed to read %s: %s", dir, err)
 		}
@@ -246,7 +246,7 @@ func getPluginBuildDefs(subrepo *core.Subrepo) map[string]*asp.Statement {
 			}
 
 			path := filepath.Join(dir, entry.Name())
-			bs, err := fs.ReadFile(subrepo.FS, path)
+			bs, err := iofs.ReadFile(subrepo.FS, path)
 			if err != nil {
 				log.Warningf("Failed to read %s: %s", path, err)
 			}