From 16ca4f2299153124ca2f996b94db92bc98fcebd1 Mon Sep 17 00:00:00 2001 From: Julie Qiu Date: Tue, 1 Sep 2020 18:52:12 -0400 Subject: internal: move Unit.Package.Documentation to Unit.Documentation The Documentation field is moved from Unit.Package.Documentation to Unit.Documentation. Unit.Package will be deprecated in a later CL. For golang/go#39629 Change-Id: Idc6d6598a2647a55b55c947120c322fec5da59cc Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/252321 Reviewed-by: Jonathan Amsterdam --- internal/testing/sample/sample.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'internal/testing/sample') diff --git a/internal/testing/sample/sample.go b/internal/testing/sample/sample.go index 1096093d..f19c3f08 100644 --- a/internal/testing/sample/sample.go +++ b/internal/testing/sample/sample.go @@ -198,7 +198,9 @@ func Module(modulePath, version string, suffixes ...string) *internal.Module { AddPackage(m, lp) } else { m.LegacyPackages = append(m.LegacyPackages, lp) - m.Units[0].Package = UnitForPackage(lp, modulePath, version).Package + u := UnitForPackage(lp, modulePath, version) + m.Units[0].Package = u.Package + m.Units[0].Documentation = u.Documentation } } return m @@ -277,15 +279,15 @@ func UnitForPackage(pkg *internal.LegacyPackage, modulePath, version string) *in UnitMeta: *UnitMeta(pkg.Path, modulePath, version, pkg.Name, pkg.IsRedistributable), Imports: pkg.Imports, LicenseContents: Licenses, + Documentation: &internal.Documentation{ + Synopsis: pkg.Synopsis, + HTML: pkg.DocumentationHTML, + GOOS: pkg.GOOS, + GOARCH: pkg.GOARCH, + }, Package: &internal.Package{ Name: pkg.Name, Path: pkg.Path, - Documentation: &internal.Documentation{ - Synopsis: pkg.Synopsis, - HTML: pkg.DocumentationHTML, - GOOS: pkg.GOOS, - GOARCH: pkg.GOARCH, - }, }, } } -- cgit v1.3-5-g45d5