aboutsummaryrefslogtreecommitdiff
path: root/src/go/internal/gcimporter/iimport.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/go/internal/gcimporter/iimport.go')
-rw-r--r--src/go/internal/gcimporter/iimport.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/go/internal/gcimporter/iimport.go b/src/go/internal/gcimporter/iimport.go
index d4778d3a74..dbc9b3a83e 100644
--- a/src/go/internal/gcimporter/iimport.go
+++ b/src/go/internal/gcimporter/iimport.go
@@ -43,12 +43,12 @@ func (r *intReader) uint64() uint64 {
// Keep this in sync with constants in iexport.go.
const (
- iexportVersionGo1_11 = 0
- iexportVersionPosCol = 1
- iexportVersionGenerics = 2
+ iexportVersionGo1_11 = 0
+ iexportVersionPosCol = 1
+ // TODO: before release, change this back to 2.
+ iexportVersionGenerics = iexportVersionPosCol
- // Start of the unstable series of versions, remove "+ n" before release.
- iexportVersionCurrent = iexportVersionGenerics + 1
+ iexportVersionCurrent = iexportVersionGenerics
)
const predeclReserved = 32
@@ -91,7 +91,7 @@ func iImportData(fset *token.FileSet, imports map[string]*types.Package, dataRea
version = int64(r.uint64())
switch version {
- case currentVersion, iexportVersionPosCol, iexportVersionGo1_11:
+ case /* iexportVersionGenerics, */ iexportVersionPosCol, iexportVersionGo1_11:
default:
if version > iexportVersionGenerics {
errorf("unstable iexport format version %d, just rebuild compiler and std library", version)