Skip to content

Commit 6552487

Browse files
committed
go/internal/gcimporter: remove support for binary export data
There should no longer be any clients of the binary export data format, and it has been deleted from the standard library, so we can now delete it from x/tools. This change deletes bimport.go, bexport.go, and bexport_test.go, transferring any shared code to the corresponding "i" files. Fixes golang/go#37312 Change-Id: I25d8a36e89c33e10de68b586245722794c4d52c3 Reviewed-on: https://go-review.googlesource.com/c/tools/+/229987 Run-TryBot: Rebecca Stambler <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Robert Griesemer <[email protected]>
1 parent 352a540 commit 6552487

14 files changed

+427
-2325
lines changed

go/gcexportdata/gcexportdata.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,11 @@ func Read(in io.Reader, fset *token.FileSet, imports map[string]*types.Package,
8585
return gcimporter.ImportData(imports, path, path, bytes.NewReader(data))
8686
}
8787

88-
// The indexed export format starts with an 'i'; the older
89-
// binary export format starts with a 'c', 'd', or 'v'
90-
// (from "version"). Select appropriate importer.
91-
if len(data) > 0 && data[0] == 'i' {
92-
_, pkg, err := gcimporter.IImportData(fset, imports, data[1:], path)
93-
return pkg, err
88+
// The indexed export format starts with an 'i'.
89+
if len(data) == 0 || data[0] != 'i' {
90+
return nil, fmt.Errorf("unknown export data format")
9491
}
95-
96-
_, pkg, err := gcimporter.BImportData(fset, imports, data, path)
92+
_, pkg, err := gcimporter.IImportData(fset, imports, data[1:], path)
9793
return pkg, err
9894
}
9995

0 commit comments

Comments
 (0)