go/types: move go/types/internal/gcimport => go/internal/gcimporter

This will make it possible to access the gcimporter (and gccgoimporter,
eventually) from the forthcoming gc/importer package, without exposing
compiler names in package names.

This change was created by manually adjusting the gcimporter paths in
go/types.bash and then running sh go/types.bash (i.e., by revendoring
gcimporter). The only manual changes are in go/types.bash.

Change-Id: Idc282439742288c09caa58b3a66d77aec0325faf
Reviewed-on: https://go-review.googlesource.com/8764
Reviewed-by: Rob Pike <r@golang.org>
Run-TryBot: Robert Griesemer <gri@golang.org>

diff --git a/src/go/types/internal/gcimporter/exportdata.go b/src/go/internal/gcimporter/exportdata.go
similarity index 100%
rename from src/go/types/internal/gcimporter/exportdata.go
rename to src/go/internal/gcimporter/exportdata.go

diff --git a/src/go/types/internal/gcimporter/gcimporter.go b/src/go/internal/gcimporter/gcimporter.go
similarity index 99%
rename from src/go/types/internal/gcimporter/gcimporter.go
rename to src/go/internal/gcimporter/gcimporter.go
index c414bad73bab52f286599060e65f95e76c37ef32..ac5180a7a1c2c3537eb82dd61ea3d5d7a35b577a 100644 (file)
--- a/src/go/types/internal/gcimporter/gcimporter.go
+++ b/src/go/internal/gcimporter/gcimporter.go
@@ -4,7 +4,7 @@
 
 // Package gcimporter implements Import for gc-generated object files.
 // Importing this package installs Import as go/types.DefaultImport.
-package gcimporter // import "go/types/internal/gcimporter"
+package gcimporter // import "go/internal/gcimporter"
 
 import (
        "bufio"

diff --git a/src/go/types/internal/gcimporter/gcimporter_test.go b/src/go/internal/gcimporter/gcimporter_test.go
similarity index 100%
rename from src/go/types/internal/gcimporter/gcimporter_test.go
rename to src/go/internal/gcimporter/gcimporter_test.go

diff --git a/src/go/types/internal/gcimporter/testdata/exports.go b/src/go/internal/gcimporter/testdata/exports.go
similarity index 100%
rename from src/go/types/internal/gcimporter/testdata/exports.go
rename to src/go/internal/gcimporter/testdata/exports.go

diff --git a/src/go/types.bash b/src/go/types.bash
index f39bd7ed3ea75e72e787bb332bb288cc1319e431..a3bfb7e640f1bd05b0b3461a928392f61650ac5d 100644 (file)
--- a/src/go/types.bash
+++ b/src/go/types.bash
@@ -40,7 +40,7 @@ function vendor() (
                # copy $f and update imports
                sed -e 's|"golang.org/x/tools/go/exact"|"go/exact"|' \
                    -e 's|"golang.org/x/tools/go/types"|"go/types"|' \
-                   -e 's|"golang.org/x/tools/go/gcimporter"|"go/types/internal/gcimporter"|' \
+                   -e 's|"golang.org/x/tools/go/gcimporter"|"go/internal/gcimporter"|' \
                    $f | gofmt > tmp.go
                mv -f tmp.go `basename $f`
        done
@@ -81,9 +81,9 @@ vendor go/types types
 install types
 
 ### go/gcimporter
-vendor go/gcimporter types/internal/gcimporter
-test types/internal/gcimporter
-install types/internal/gcimporter
+vendor go/gcimporter internal/gcimporter
+test internal/gcimporter
+install internal/gcimporter
 
 ### test go/types (requires gcimporter)
 test types

diff --git a/src/go/types/api.go b/src/go/types/api.go
index c3681e93626f36aae3f4dd67b75f34798e5b9faa..a2c304c6f600089fa34169b6187aadb87b52fd26 100644 (file)
--- a/src/go/types/api.go
+++ b/src/go/types/api.go
@@ -122,7 +122,7 @@ type Config struct {
 // DefaultImport is the default importer invoked if Config.Import == nil.
 // The declaration:
 //
-//     import _ "go/types/internal/gcimporter"
+//     import _ "go/internal/gcimporter"
 //
 // in a client of go/types will initialize DefaultImport to gcimporter.Import.
 var DefaultImport Importer

diff --git a/src/go/types/api_test.go b/src/go/types/api_test.go
index 983ac950bfc0f609528fa6e658e4ea9c0bb38342..1be7c6af3225161b795505e3fcc8a0abfbe5e6b9 100644 (file)
--- a/src/go/types/api_test.go
+++ b/src/go/types/api_test.go
@@ -14,8 +14,8 @@ import (
        "strings"
        "testing"
 
+       _ "go/internal/gcimporter"
        . "go/types"
-       _ "go/types/internal/gcimporter"
 )
 
 // skipSpecialPlatforms causes the test to be skipped for platforms where

diff --git a/src/go/types/builtins_test.go b/src/go/types/builtins_test.go
index fa18277e32a3589c2eca8c9401b4ada69cdc13e0..2e939213a4311139677016457bd5e1ceb5efc994 100644 (file)
--- a/src/go/types/builtins_test.go
+++ b/src/go/types/builtins_test.go
@@ -10,8 +10,8 @@ import (
        "go/parser"
        "testing"
 
+       _ "go/internal/gcimporter"
        . "go/types"
-       _ "go/types/internal/gcimporter"
 )
 
 var builtinCalls = []struct {

diff --git a/src/go/types/check_test.go b/src/go/types/check_test.go
index 6d2b5e957b0743be423bf4a4bbeba47ca8c6d4c8..3c5f36b8fbb7b6c52c524c6fe402ba0347d2bf17 100644 (file)
--- a/src/go/types/check_test.go
+++ b/src/go/types/check_test.go
@@ -36,8 +36,8 @@ import (
        "strings"
        "testing"
 
+       _ "go/internal/gcimporter"
        . "go/types"
-       _ "go/types/internal/gcimporter"
 )
 
 var (

diff --git a/src/go/types/eval_test.go b/src/go/types/eval_test.go
index 8fc15034d0363e2eabf46f6ec9f20a43dc532b00..82c011c17e22f24a13d2f5b21564f5f87087c0de 100644 (file)
--- a/src/go/types/eval_test.go
+++ b/src/go/types/eval_test.go
@@ -13,8 +13,8 @@ import (
        "strings"
        "testing"
 
+       _ "go/internal/gcimporter"
        . "go/types"
-       _ "go/types/internal/gcimporter"
 )
 
 func testEval(t *testing.T, pkg *Package, scope *Scope, str string, typ Type, typStr, valStr string) {

diff --git a/src/go/types/issues_test.go b/src/go/types/issues_test.go
index 3722dc2006edc68ac107cc7f7783c75575bcabf2..d8d27b8a5bd2421e05f3250a91102d3549f630f1 100644 (file)
--- a/src/go/types/issues_test.go
+++ b/src/go/types/issues_test.go
@@ -14,8 +14,8 @@ import (
        "strings"
        "testing"
 
+       _ "go/internal/gcimporter"
        . "go/types"
-       _ "go/types/internal/gcimporter"
 )
 
 func TestIssue5770(t *testing.T) {

diff --git a/src/go/types/resolver.go b/src/go/types/resolver.go
index ee8fff0639b28f349142b5bd2bda3d1252e3feb6..1780c584ab150050435340a4b621a565063ea6db 100644 (file)
--- a/src/go/types/resolver.go
+++ b/src/go/types/resolver.go
@@ -135,7 +135,7 @@ func (check *Checker) collectObjects() {
                } else {
                        // Panic if we encounter an import.
                        importer = func(map[string]*Package, string) (*Package, error) {
-                               panic(`no Config.Import or DefaultImport (missing import _ "go/types/internal/gcimporter"?)`)
+                               panic(`no Config.Import or DefaultImport (missing import _ "go/internal/gcimporter"?)`)
                        }
                }
        }

diff --git a/src/go/types/resolver_test.go b/src/go/types/resolver_test.go
index cfd04dad1e30b081872246d8ab44819188c196c7..52708ae028099cfeb561bd034bad4d9f86015be4 100644 (file)
--- a/src/go/types/resolver_test.go
+++ b/src/go/types/resolver_test.go
@@ -12,8 +12,8 @@ import (
        "sort"
        "testing"
 
+       _ "go/internal/gcimporter"
        . "go/types"
-       _ "go/types/internal/gcimporter"
 )
 
 var sources = []string{

diff --git a/src/go/types/self_test.go b/src/go/types/self_test.go
index dc397b587c2b00ce4a4f8d8e45de01da104f41a5..e98af304edeb917df56b7c9c5466d89866210648 100644 (file)
--- a/src/go/types/self_test.go
+++ b/src/go/types/self_test.go
@@ -14,8 +14,8 @@ import (
        "testing"
        "time"
 
+       _ "go/internal/gcimporter"
        . "go/types"
-       _ "go/types/internal/gcimporter"
 )
 
 var benchmark = flag.Bool("b", false, "run benchmarks")

diff --git a/src/go/types/stdlib_test.go b/src/go/types/stdlib_test.go
index 4b66944989812ee1f7c58c000a494375b69a6433..468b419a38fe9718d92ec7579cd44a674263e534 100644 (file)
--- a/src/go/types/stdlib_test.go
+++ b/src/go/types/stdlib_test.go
@@ -22,8 +22,8 @@ import (
        "testing"
        "time"
 
+       _ "go/internal/gcimporter"
        . "go/types"
-       _ "go/types/internal/gcimporter"
 )
 
 var (

diff --git a/src/go/types/typestring_test.go b/src/go/types/typestring_test.go
index b01fe991c4723b0c10de32146fddf759c5c3d27b..254867382f41418cc67873bab6146c3e6b330b02 100644 (file)
--- a/src/go/types/typestring_test.go
+++ b/src/go/types/typestring_test.go
@@ -10,8 +10,8 @@ import (
        "go/token"
        "testing"
 
+       _ "go/internal/gcimporter"
        . "go/types"
-       _ "go/types/internal/gcimporter"
 )
 
 const filename = "<src>"