From cf670267be10c1b9044a9299196b3c9f2b9db125 Mon Sep 17 00:00:00 2001 From: Rebecca Stambler Date: Tue, 28 Jan 2020 18:17:02 -0500 Subject: [PATCH] go/packages: remove code that handled ordering in overlays Now that overlays are sorted before being processed, we can assume a consistent ordering of non-test files before test files. Some of the code in the overlay processing therefore becomes unneeded. Change-Id: Ic7a20ceb7013af7ce876a280c975eadf717157d7 Reviewed-on: https://go-review.googlesource.com/c/tools/+/216722 Run-TryBot: Rebecca Stambler TryBot-Result: Gobot Gobot Reviewed-by: Heschi Kreinick --- go/packages/golist_overlay.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/go/packages/golist_overlay.go b/go/packages/golist_overlay.go index 3760744e51..7974a6c9bb 100644 --- a/go/packages/golist_overlay.go +++ b/go/packages/golist_overlay.go @@ -50,7 +50,6 @@ func (state *golistState) processGolistOverlay(response *responseDeduper) (modif } return overlayFiles[i] < overlayFiles[j] }) - for _, opath := range overlayFiles { contents := state.cfg.Overlay[opath] base := filepath.Base(opath) @@ -82,14 +81,8 @@ func (state *golistState) processGolistOverlay(response *responseDeduper) (modif testVariantOf = p continue nextPackage } + // We must have already seen the package of which this is a test variant. if pkg != nil && p != pkg && pkg.PkgPath == p.PkgPath { - // If we've already seen the test variant, - // make sure to label which package it is a test variant of. - if hasTestFiles(pkg) { - testVariantOf = p - continue nextPackage - } - // If we have already seen the package of which this is a test variant. if hasTestFiles(p) { testVariantOf = pkg }