Move subst package into go/extractor/util

go/extractor/BUILD.bazel

@@ -19,7 +19,6 @@ go_library(
         "//go/extractor/dbscheme",
         "//go/extractor/diagnostics",
         "//go/extractor/srcarchive",
-        "//go/extractor/subst",
         "//go/extractor/toolchain",
         "//go/extractor/trap",
         "//go/extractor/util",

go/extractor/extractor.go

@@ -25,7 +25,6 @@ import (
 	"github.com/github/codeql-go/extractor/dbscheme"
 	"github.com/github/codeql-go/extractor/diagnostics"
 	"github.com/github/codeql-go/extractor/srcarchive"
-	"github.com/github/codeql-go/extractor/subst"
 	"github.com/github/codeql-go/extractor/toolchain"
 	"github.com/github/codeql-go/extractor/trap"
 	"github.com/github/codeql-go/extractor/util"
@@ -767,7 +766,7 @@ func normalizedPath(ast *ast.File, fset *token.FileSet) string {
 	if err != nil {
 		path = file
 	}
-	return subst.ResolvePath(path)
+	return util.ResolvePath(path)
 }
 
 // extractFile extracts AST information for the given file

go/extractor/subst/BUILD.bazel

@@ -1,18 +0,0 @@
-load("@rules_go//go:def.bzl", "go_library")
-
-go_library(
-    name = "subst",
-    srcs = [
-        "subst.go",
-        "subst_other.go",
-        "subst_windows.go",
-    ],
-    importpath = "github.com/github/codeql-go/extractor/subst",
-    visibility = ["//go:__subpackages__"],
-    deps = select({
-        "@rules_go//go/platform:windows": [
-            "@org_golang_x_sys//windows",
-        ],
-        "//conditions:default": [],
-    }),
-)

go/extractor/util/BUILD.bazel

@@ -9,11 +9,19 @@ go_library(
         "logging.go",
         "overlays.go",
         "semver.go",
+        "subst.go",
+        "subst_other.go",
+        "subst_windows.go",
         "util.go",
     ],
     importpath = "github.com/github/codeql-go/extractor/util",
     visibility = ["//visibility:public"],
-    deps = ["@org_golang_x_mod//semver"],
+    deps = ["@org_golang_x_mod//semver"] + select({
+        "@rules_go//go/platform:windows": [
+            "@org_golang_x_sys//windows",
+        ],
+        "//conditions:default": [],
+    }),
 )
 
 go_test(

go/extractor/util/subst.go

@@ -1,4 +1,4 @@
-package subst
+package util
 
 // ResolvePath resolves subst'd drive letters in a full path.
 // If the path starts with a subst'd drive letter, replaces it with the backing path.

go/extractor/util/subst_other.go

@@ -1,6 +1,6 @@
 //go:build !windows
 
-package subst
+package util
 
 // ResolveDrive is a no-op on non-Windows platforms.
 func ResolveDrive(driveRoot string) string { return "" }

go/extractor/util/subst_windows.go

@@ -1,6 +1,6 @@
 //go:build windows
 
-package subst
+package util
 
 import (
 	"os"