From 5dfd8930f264888dd5fe26820a0ac605a384dd33 Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Mon, 9 Apr 2018 18:10:05 -0700 Subject: [PATCH] go/internal/gcimporter: rename from go/gcimporter15 Follow through on promise to remove the old API. Change-Id: If1f5addfeb1b82acc5a1730474e2f06102dbb615 Reviewed-on: https://go-review.googlesource.com/105977 Run-TryBot: Matthew Dempsky TryBot-Result: Gobot Gobot Reviewed-by: Robert Griesemer Reviewed-by: Alan Donovan --- go/gcexportdata/gcexportdata.go | 5 +---- go/{gcimporter15 => internal/gcimporter}/bexport.go | 0 .../gcimporter}/bexport19_test.go | 2 +- .../gcimporter}/bexport_test.go | 2 +- go/{gcimporter15 => internal/gcimporter}/bimport.go | 0 .../gcimporter}/exportdata.go | 0 .../gcimporter}/gcimporter.go | 8 ++------ .../gcimporter}/gcimporter_test.go | 0 .../gcimporter}/isAlias18.go | 0 .../gcimporter}/isAlias19.go | 0 .../gcimporter}/testdata/a.go | 0 .../gcimporter}/testdata/b.go | 0 .../gcimporter}/testdata/exports.go | 0 .../gcimporter}/testdata/issue15920.go | 0 .../gcimporter}/testdata/issue20046.go | 0 .../gcimporter}/testdata/p.go | 0 .../gcimporter}/testdata/versions/test.go | 0 .../gcimporter}/testdata/versions/test_go1.7_0.a | Bin .../gcimporter}/testdata/versions/test_go1.7_1.a | Bin 19 files changed, 5 insertions(+), 12 deletions(-) rename go/{gcimporter15 => internal/gcimporter}/bexport.go (100%) rename go/{gcimporter15 => internal/gcimporter}/bexport19_test.go (97%) rename go/{gcimporter15 => internal/gcimporter}/bexport_test.go (99%) rename go/{gcimporter15 => internal/gcimporter}/bimport.go (100%) rename go/{gcimporter15 => internal/gcimporter}/exportdata.go (100%) rename go/{gcimporter15 => internal/gcimporter}/gcimporter.go (99%) rename go/{gcimporter15 => internal/gcimporter}/gcimporter_test.go (100%) rename go/{gcimporter15 => internal/gcimporter}/isAlias18.go (100%) rename go/{gcimporter15 => internal/gcimporter}/isAlias19.go (100%) rename go/{gcimporter15 => internal/gcimporter}/testdata/a.go (100%) rename go/{gcimporter15 => internal/gcimporter}/testdata/b.go (100%) rename go/{gcimporter15 => internal/gcimporter}/testdata/exports.go (100%) rename go/{gcimporter15 => internal/gcimporter}/testdata/issue15920.go (100%) rename go/{gcimporter15 => internal/gcimporter}/testdata/issue20046.go (100%) rename go/{gcimporter15 => internal/gcimporter}/testdata/p.go (100%) rename go/{gcimporter15 => internal/gcimporter}/testdata/versions/test.go (100%) rename go/{gcimporter15 => internal/gcimporter}/testdata/versions/test_go1.7_0.a (100%) rename go/{gcimporter15 => internal/gcimporter}/testdata/versions/test_go1.7_1.a (100%) diff --git a/go/gcexportdata/gcexportdata.go b/go/gcexportdata/gcexportdata.go index e53270e0..b44bdbfc 100644 --- a/go/gcexportdata/gcexportdata.go +++ b/go/gcexportdata/gcexportdata.go @@ -7,9 +7,6 @@ // gc compiler. This package supports go1.7 export data format and all // later versions. // -// This package replaces the deprecated golang.org/x/tools/go/gcimporter15 -// package, which will be deleted in October 2017. -// // Although it might seem convenient for this package to live alongside // go/types in the standard library, this would cause version skew // problems for developer tools that use it, since they must be able to @@ -32,7 +29,7 @@ import ( "io" "io/ioutil" - gcimporter "golang.org/x/tools/go/gcimporter15" + "golang.org/x/tools/go/internal/gcimporter" ) // Find returns the name of an object (.o) or archive (.a) file diff --git a/go/gcimporter15/bexport.go b/go/internal/gcimporter/bexport.go similarity index 100% rename from go/gcimporter15/bexport.go rename to go/internal/gcimporter/bexport.go diff --git a/go/gcimporter15/bexport19_test.go b/go/internal/gcimporter/bexport19_test.go similarity index 97% rename from go/gcimporter15/bexport19_test.go rename to go/internal/gcimporter/bexport19_test.go index f6e9733b..0107f808 100644 --- a/go/gcimporter15/bexport19_test.go +++ b/go/internal/gcimporter/bexport19_test.go @@ -13,7 +13,7 @@ import ( "go/types" "testing" - gcimporter "golang.org/x/tools/go/gcimporter15" + "golang.org/x/tools/go/internal/gcimporter" ) const src = ` diff --git a/go/gcimporter15/bexport_test.go b/go/internal/gcimporter/bexport_test.go similarity index 99% rename from go/gcimporter15/bexport_test.go rename to go/internal/gcimporter/bexport_test.go index 6ab3bcb1..4279ad36 100644 --- a/go/gcimporter15/bexport_test.go +++ b/go/internal/gcimporter/bexport_test.go @@ -18,7 +18,7 @@ import ( "testing" "golang.org/x/tools/go/buildutil" - gcimporter "golang.org/x/tools/go/gcimporter15" + "golang.org/x/tools/go/internal/gcimporter" "golang.org/x/tools/go/loader" ) diff --git a/go/gcimporter15/bimport.go b/go/internal/gcimporter/bimport.go similarity index 100% rename from go/gcimporter15/bimport.go rename to go/internal/gcimporter/bimport.go diff --git a/go/gcimporter15/exportdata.go b/go/internal/gcimporter/exportdata.go similarity index 100% rename from go/gcimporter15/exportdata.go rename to go/internal/gcimporter/exportdata.go diff --git a/go/gcimporter15/gcimporter.go b/go/internal/gcimporter/gcimporter.go similarity index 99% rename from go/gcimporter15/gcimporter.go rename to go/internal/gcimporter/gcimporter.go index 6fbc9d76..58e558c9 100644 --- a/go/gcimporter15/gcimporter.go +++ b/go/internal/gcimporter/gcimporter.go @@ -6,14 +6,10 @@ // but it also contains the original source-based importer code for Go1.6. // Once we stop supporting 1.6, we can remove that code. -// Package gcimporter15 provides various functions for reading +// Package gcimporter provides various functions for reading // gc-generated object files that can be used to implement the // Importer interface defined by the Go 1.5 standard library package. -// -// Deprecated: this package will be deleted in October 2017. -// New code should use golang.org/x/tools/go/gcexportdata. -// -package gcimporter // import "golang.org/x/tools/go/gcimporter15" +package gcimporter // import "golang.org/x/tools/go/internal/gcimporter" import ( "bufio" diff --git a/go/gcimporter15/gcimporter_test.go b/go/internal/gcimporter/gcimporter_test.go similarity index 100% rename from go/gcimporter15/gcimporter_test.go rename to go/internal/gcimporter/gcimporter_test.go diff --git a/go/gcimporter15/isAlias18.go b/go/internal/gcimporter/isAlias18.go similarity index 100% rename from go/gcimporter15/isAlias18.go rename to go/internal/gcimporter/isAlias18.go diff --git a/go/gcimporter15/isAlias19.go b/go/internal/gcimporter/isAlias19.go similarity index 100% rename from go/gcimporter15/isAlias19.go rename to go/internal/gcimporter/isAlias19.go diff --git a/go/gcimporter15/testdata/a.go b/go/internal/gcimporter/testdata/a.go similarity index 100% rename from go/gcimporter15/testdata/a.go rename to go/internal/gcimporter/testdata/a.go diff --git a/go/gcimporter15/testdata/b.go b/go/internal/gcimporter/testdata/b.go similarity index 100% rename from go/gcimporter15/testdata/b.go rename to go/internal/gcimporter/testdata/b.go diff --git a/go/gcimporter15/testdata/exports.go b/go/internal/gcimporter/testdata/exports.go similarity index 100% rename from go/gcimporter15/testdata/exports.go rename to go/internal/gcimporter/testdata/exports.go diff --git a/go/gcimporter15/testdata/issue15920.go b/go/internal/gcimporter/testdata/issue15920.go similarity index 100% rename from go/gcimporter15/testdata/issue15920.go rename to go/internal/gcimporter/testdata/issue15920.go diff --git a/go/gcimporter15/testdata/issue20046.go b/go/internal/gcimporter/testdata/issue20046.go similarity index 100% rename from go/gcimporter15/testdata/issue20046.go rename to go/internal/gcimporter/testdata/issue20046.go diff --git a/go/gcimporter15/testdata/p.go b/go/internal/gcimporter/testdata/p.go similarity index 100% rename from go/gcimporter15/testdata/p.go rename to go/internal/gcimporter/testdata/p.go diff --git a/go/gcimporter15/testdata/versions/test.go b/go/internal/gcimporter/testdata/versions/test.go similarity index 100% rename from go/gcimporter15/testdata/versions/test.go rename to go/internal/gcimporter/testdata/versions/test.go diff --git a/go/gcimporter15/testdata/versions/test_go1.7_0.a b/go/internal/gcimporter/testdata/versions/test_go1.7_0.a similarity index 100% rename from go/gcimporter15/testdata/versions/test_go1.7_0.a rename to go/internal/gcimporter/testdata/versions/test_go1.7_0.a diff --git a/go/gcimporter15/testdata/versions/test_go1.7_1.a b/go/internal/gcimporter/testdata/versions/test_go1.7_1.a similarity index 100% rename from go/gcimporter15/testdata/versions/test_go1.7_1.a rename to go/internal/gcimporter/testdata/versions/test_go1.7_1.a