diff options
| author | Julie Qiu <julie@golang.org> | 2020-09-01 18:52:12 -0400 |
|---|---|---|
| committer | Julie Qiu <julie@golang.org> | 2020-09-02 16:45:25 +0000 |
| commit | 16ca4f2299153124ca2f996b94db92bc98fcebd1 (patch) | |
| tree | 798a3073849cb63b6ac5391b7900a4a1b6dd57df /internal/postgres/unit.go | |
| parent | afffc195e7586c235e41479ad391babe4f2edb05 (diff) | |
| download | go-x-pkgsite-16ca4f2299153124ca2f996b94db92bc98fcebd1.tar.xz | |
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 <jba@google.com>
Diffstat (limited to 'internal/postgres/unit.go')
| -rw-r--r-- | internal/postgres/unit.go | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/internal/postgres/unit.go b/internal/postgres/unit.go index 59871efd..2e16b7af 100644 --- a/internal/postgres/unit.go +++ b/internal/postgres/unit.go @@ -104,13 +104,7 @@ func (db *DB) GetUnit(ctx context.Context, um *internal.UnitMeta, fields interna if err != nil && !errors.Is(err, derrors.NotFound) { return nil, err } - if doc != nil { - u.Package = &internal.Package{ - Path: u.Path, - Name: u.Name, - Documentation: doc, - } - } + u.Documentation = doc } if fields&internal.WithImports != 0 { imports, err := db.getImports(ctx, pathID) @@ -130,12 +124,10 @@ func (db *DB) GetUnit(ctx context.Context, um *internal.UnitMeta, fields interna } if fields == internal.AllFields { if u.Name != "" { - if u.Package == nil { - u.Package = &internal.Package{ - Path: u.Path, - } + u.Package = &internal.Package{ + Path: u.Path, + Name: u.Name, } - u.Package.Name = u.Name } } if !db.bypassLicenseCheck { |