Skip to content

Commit e658e9f

Browse files
committed
combine LoadMode bits
1 parent c053272 commit e658e9f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

go/packages/golist.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func goListDriver(cfg *Config, patterns ...string) (_ *DriverResponse, err error
145145
}
146146

147147
// Fill in response.Sizes asynchronously if necessary.
148-
if cfg.Mode&NeedTypesSizes != 0 || cfg.Mode&NeedTypes != 0 || cfg.Mode&NeedTypesInfo != 0 {
148+
if cfg.Mode&NeedTypesSizes != 0 || cfg.Mode&(NeedTypes|NeedTypesInfo) != 0 {
149149
errCh := make(chan error)
150150
go func() {
151151
compiler, arch, err := getSizesForArgs(ctx, state.cfgInvocation(), cfg.gocmdRunner)

go/packages/packages.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ func newLoader(cfg *Config) *loader {
764764
ld.requestedMode = ld.Mode
765765
ld.Mode = impliedLoadMode(ld.Mode)
766766

767-
if ld.Mode&NeedTypes != 0 || ld.Mode&NeedSyntax != 0 || ld.Mode&NeedTypesInfo != 0 {
767+
if ld.Mode&(NeedTypes|NeedSyntax|NeedTypesInfo) != 0 {
768768
if ld.Fset == nil {
769769
ld.Fset = token.NewFileSet()
770770
}
@@ -920,7 +920,7 @@ func (ld *loader) refine(response *DriverResponse) ([]*Package, error) {
920920

921921
// Load type data and syntax if needed, starting at
922922
// the initial packages (roots of the import DAG).
923-
if ld.Mode&NeedTypes != 0 || ld.Mode&NeedSyntax != 0 || ld.Mode&NeedTypesInfo != 0 {
923+
if ld.Mode&(NeedTypes|NeedSyntax|NeedTypesInfo) != 0 {
924924
var wg sync.WaitGroup
925925
for _, lpkg := range initial {
926926
wg.Add(1)
@@ -1158,7 +1158,7 @@ func (ld *loader) loadPackage(lpkg *loaderPackage) {
11581158
}
11591159

11601160
lpkg.Syntax = files
1161-
if ld.Config.Mode&NeedTypes == 0 && ld.Config.Mode&NeedTypesInfo == 0 {
1161+
if ld.Config.Mode&(NeedTypes|NeedTypesInfo) == 0 {
11621162
return
11631163
}
11641164

0 commit comments

Comments
 (0)