From 34b416bd17b3a33e02879e34237e92c171550ed5 Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Tue, 6 Nov 2018 17:04:41 -0500 Subject: [PATCH] go/packages: change the driverResponse.Sizes to have type StdSizes This will allow Sizes to be marshalled and unmarshalled. All the Sizes we care about ane StdSizes anyways. Change-Id: I79d1dcaebba32f7730de4375945e372eeefa78fe Reviewed-on: https://go-review.googlesource.com/c/147978 Run-TryBot: Michael Matloob TryBot-Result: Gobot Gobot Reviewed-by: Alan Donovan --- go/packages/golist.go | 3 ++- go/packages/packages.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go/packages/golist.go b/go/packages/golist.go index ff42de48..dfaeed85 100644 --- a/go/packages/golist.go +++ b/go/packages/golist.go @@ -113,7 +113,8 @@ extractQueries: if sizeserr != nil { return nil, sizeserr } - response.Sizes = sizes + // types.SizesFor always returns nil or a *types.StdSizes + response.Sizes, _ = sizes.(*types.StdSizes) if len(containFiles) == 0 && len(packagesNamed) == 0 { return response, nil diff --git a/go/packages/packages.go b/go/packages/packages.go index 7d713fc7..d359a33a 100644 --- a/go/packages/packages.go +++ b/go/packages/packages.go @@ -138,7 +138,7 @@ type driver func(cfg *Config, patterns ...string) (*driverResponse, error) // driverResponse contains the results for a driver query. type driverResponse struct { // Sizes, if not nil, is the types.Sizes to use when type checking. - Sizes types.Sizes + Sizes *types.StdSizes // Roots is the set of package IDs that make up the root packages. // We have to encode this separately because when we encode a single package