Merge branch 'master' of github.com:kisielk/errcheck

kisielk · Jul 31, 2015 · 50b84cf · 50b84cf
2 parents eff789f + 76bf61e
commit 50b84cf
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/internal/errcheck.go → internal/errcheck/errcheck.go b/internal/errcheck.go → internal/errcheck/errcheck.go
@@ -96,8 +96,7 @@ func (c *Checker) CheckPackages(paths ...string) error {
 		ctx.BuildTags = append(ctx.BuildTags, tag)
 	}
 	loadcfg := loader.Config{
-		ImportFromBinary: false,
-		Build:            &ctx,
+		Build: &ctx,
 	}
 	rest, err := loadcfg.FromArgs(paths, true)
 	if err != nil {

diff --git a/internal/errcheck_test.go → internal/errcheck/errcheck_test.go b/internal/errcheck_test.go → internal/errcheck/errcheck_test.go
diff --git a/main.go b/main.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/kisielk/errcheck/internal"
+	"github.com/kisielk/errcheck/internal/errcheck"
 	"github.com/kisielk/gotool"
 )
 

diff --git a/main_test.go b/main_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/kisielk/errcheck/internal"
+	"github.com/kisielk/errcheck/internal/errcheck"
 )
 
 func TestMain(t *testing.T) {