]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/compile/internal/noder: replace recompile library error messages
authorTim King <taking@google.com>
Fri, 8 Nov 2024 19:21:18 +0000 (11:21 -0800)
committerGo LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Fri, 8 Nov 2024 21:22:55 +0000 (21:22 +0000)
Replaces 'recompile library' error messages with the more accurate
'recompile package' globally.

Change-Id: I7247964c76f1fcb94feda37c78bdfb8a1b1a6492
Reviewed-on: https://go-review.googlesource.com/c/go/+/626696
Reviewed-by: Alan Donovan <adonovan@google.com>
Commit-Queue: Tim King <taking@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

src/cmd/compile/internal/importer/gcimporter.go
src/cmd/compile/internal/noder/import.go
src/go/internal/gcimporter/gcimporter.go

index 9bc180d9879611c96fa487128cac2ee0262eeb38..b89d7477c78a6431109a141cf4febdbca9edcff3 100644 (file)
@@ -213,7 +213,7 @@ func Import(packages map[string]*types2.Package, path, srcDir string, lookup fun
 
        switch hdr {
        case "$$\n":
-               err = fmt.Errorf("import %q: old textual export format no longer supported (recompile library)", path)
+               err = fmt.Errorf("import %q: old textual export format no longer supported (recompile package)", path)
 
        case "$$B\n":
                // TODO(taking): minimize code delta with src/go/internal/gcimporter.Import.
index e9bb1e313b65303641e6d544179c1715b1fb3d37..1e4c1ecb63cc499b0e8d93c13605317e24b27a0b 100644 (file)
@@ -308,7 +308,7 @@ func findExportData(f *os.File) (r *bio.Reader, end int64, err error) {
 
        // Expect $$B\n to signal binary import format.
        if line != "$$B\n" {
-               err = errors.New("old export format no longer supported (recompile library)")
+               err = errors.New("old export format no longer supported (recompile package)")
                return
        }
 
index a019510447e960325a36c932de42cedeeac877c2..f86b20da8d0d36b7699f3a9f4f411f0bdbc2d444 100644 (file)
@@ -209,8 +209,7 @@ func Import(fset *token.FileSet, packages map[string]*types.Package, path, srcDi
 
        switch hdr {
        case "$$\n":
-               // TODO(taking): 's/(recompile library)/(recompile package)/g'.
-               err = fmt.Errorf("import %q: old textual export format no longer supported (recompile library)", path)
+               err = fmt.Errorf("import %q: old textual export format no longer supported (recompile package)", path)
 
        case "$$B\n":
                var exportFormat byte