Prepare for #205: use forked repos without aliases

Gopkg.lock

@@ -17,15 +17,6 @@
   revision = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"
   version = "1.0.0"
 
-[[projects]]
-  branch = "master"
-  digest = "1:07d5a5772acf81583937919b21bee82377499b26d68d361b48bf8afcca1b41e5"
-  name = "github.com/client9/misspell"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "950f5d19e77066a2353d9a22e89f8f889d1d7012"
-  source = "github.com/golangci/misspell"
-
 [[projects]]
   digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39"
   name = "github.com/davecgh/go-spew"
@@ -105,6 +96,32 @@
   pruneopts = "UT"
   revision = "cfe4005ccda277a820149d44d6ededc400cc99a2"
 
+[[projects]]
+  branch = "master"
+  digest = "1:efb8cf3f0c2f47844104d6e879fc77d846649df794e378cae50e749fad1bb1dc"
+  name = "github.com/golangci/dupl"
+  packages = [
+    ".",
+    "job",
+    "printer",
+    "suffixtree",
+    "syntax",
+    "syntax/golang",
+  ]
+  pruneopts = "UT"
+  revision = "3e9179ac440a0386ac7cc9a085fc44397c6b9bbc"
+
+[[projects]]
+  branch = "master"
+  digest = "1:2146ed9836ab6af9cbe527299544566ee7506ca6dcd4ab71d761141c015ba174"
+  name = "github.com/golangci/errcheck"
+  packages = [
+    "golangci",
+    "internal/errcheck",
+  ]
+  pruneopts = "UT"
+  revision = "f726ab79eeeb2d770a997ee4d9bce4ca674956a0"
+
 [[projects]]
   branch = "master"
   digest = "1:f63d85b6e551b6c8aa3ed2e42b64db15f5b525bdb01fa36af18288f1de4c859b"
@@ -113,6 +130,25 @@
   pruneopts = "UT"
   revision = "927a3d87b613e9f6f0fb7ef8bb8de8b83c30a5a2"
 
+[[projects]]
+  branch = "master"
+  digest = "1:159ec56cf5d1e0bb8c68082ccbcad9a854be7e28d3c2a20e285305ae4ca96778"
+  name = "github.com/golangci/go-tools"
+  packages = [
+    "deprecated",
+    "functions",
+    "internal/sharedcheck",
+    "lint",
+    "lint/lintutil",
+    "simple",
+    "staticcheck",
+    "staticcheck/vrp",
+    "unused",
+    "version",
+  ]
+  pruneopts = "UT"
+  revision = "93eecd106a0b4f93401f91127a550709f819193d"
+
 [[projects]]
   branch = "master"
   digest = "1:e1b9fbecb1d985f291dbca59767070fe899f38d1b40f7e9433f9a42b7fb3bd4e"
@@ -171,6 +207,22 @@
   pruneopts = "UT"
   revision = "2ee8f2867dde308c46d401d6d30f6c644094b167"
 
+[[projects]]
+  branch = "master"
+  digest = "1:8a043d165b607fada34aceb22e8f5d1fb80871f5b2d6c3e5d5933c37094c9228"
+  name = "github.com/golangci/interfacer"
+  packages = ["check"]
+  pruneopts = "UT"
+  revision = "01958817a6ec5bb4bb01d0b9a5f3fca30923ebbf"
+
+[[projects]]
+  branch = "master"
+  digest = "1:59b6cfe4fe54ed13f7570c74b2581100ad6f65cf421b3d5c992d863b238fbc39"
+  name = "github.com/golangci/lint"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "c2187e7932b5ee7899eaa2e83bcf00e251abd274"
+
 [[projects]]
   branch = "master"
   digest = "1:fdc1b377c447d5168fc335f30de8d55333ccebfa64ce97b9e03b6cb1ce14b178"
@@ -187,6 +239,14 @@
   pruneopts = "UT"
   revision = "b1d89398deca2fd3f8578e5a9551e819bd01ca5f"
 
+[[projects]]
+  branch = "master"
+  digest = "1:07d5a5772acf81583937919b21bee82377499b26d68d361b48bf8afcca1b41e5"
+  name = "github.com/golangci/misspell"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "950f5d19e77066a2353d9a22e89f8f889d1d7012"
+
 [[projects]]
   branch = "master"
   digest = "1:6bc38b03a76ac4ce44482b437c6a31ec441e494abd271d63722f99ac2e7e9e80"
@@ -203,6 +263,21 @@
   pruneopts = "UT"
   revision = "d9c87f5ffaf08801898f780cf66e7026e2174097"
 
+[[projects]]
+  branch = "master"
+  digest = "1:ba7223001c6b9de88a3e5beb6e441b3d559e09e3e9bc8ff866b2c0e72a6f7f8f"
+  name = "github.com/golangci/tools"
+  packages = [
+    "go/callgraph",
+    "go/callgraph/cha",
+    "go/callgraph/rta",
+    "go/callgraph/static",
+    "go/ssa",
+    "go/ssa/ssautil",
+  ]
+  pruneopts = "UT"
+  revision = "98e75f53b4b9b9243ddc6f08b76f7682294b53b5"
+
 [[projects]]
   branch = "master"
   digest = "1:c553e7c7483f2d6db1e84a27a18df144ed4041792d7556916369f86ccf5409fe"
@@ -211,6 +286,14 @@
   pruneopts = "UT"
   revision = "28b1c447d1f4a810737ee6ab40ea6c1d0ceae4ad"
 
+[[projects]]
+  branch = "master"
+  digest = "1:5b3fb341e79acec135f1241e4d72b9a8231f705852f752142fb800115f50ba80"
+  name = "github.com/golangci/unparam"
+  packages = ["check"]
+  pruneopts = "UT"
+  revision = "ff2498c2efa8282b1d7511cad18904a47a460782"
+
 [[projects]]
   branch = "master"
   digest = "1:a361611b8c8c75a1091f00027767f7779b29cb37c456a71b8f2604c88057ab40"
@@ -238,18 +321,6 @@
   revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
   version = "v1.0"
 
-[[projects]]
-  branch = "master"
-  digest = "1:92ecd3161b2baa430167882933fd9a62f997242b7689cc867f7bfc09322c79fb"
-  name = "github.com/kisielk/errcheck"
-  packages = [
-    "golangci",
-    "internal/errcheck",
-  ]
-  pruneopts = "UT"
-  revision = "46cecd339393da3e3742fc0045eb5e5ec0dd6563"
-  source = "github.com/golangci/errcheck"
-
 [[projects]]
   digest = "1:15ec2166e33ef6c60b344a04d050eec79193517e7f5082b6233b2d09ef0d10b8"
   name = "github.com/kisielk/gotool"
@@ -285,22 +356,6 @@
   revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
   version = "v0.0.3"
 
-[[projects]]
-  branch = "master"
-  digest = "1:5cb872835e9779d6daff8541d29c5f6e97faa0fea04d35cc19441dcfb0ddf632"
-  name = "github.com/mibk/dupl"
-  packages = [
-    ".",
-    "job",
-    "printer",
-    "suffixtree",
-    "syntax",
-    "syntax/golang",
-  ]
-  pruneopts = "UT"
-  revision = "53b9af5a45362a6f2896cfa39cc17d17ba9667ea"
-  source = "github.com/golangci/dupl"
-
 [[projects]]
   branch = "master"
   digest = "1:d0c95a34e79df79eb96ca870d6b6fc43361d34c9c05495f93a5ad0077f7bbb24"
@@ -494,27 +549,21 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:47357b70bddc05651ec8cf40328574158264e199908fc6d952ffb4c18934fd54"
+  digest = "1:1c24352e1722a8954fe7c95bcb12d878ef9883b01fe3e0e801f62e8cbf9621a0"
   name = "golang.org/x/tools"
   packages = [
     "go/ast/astutil",
     "go/buildutil",
-    "go/callgraph",
-    "go/callgraph/cha",
-    "go/callgraph/rta",
-    "go/callgraph/static",
     "go/gcexportdata",
+    "go/internal/cgo",
     "go/internal/gcimporter",
     "go/loader",
-    "go/ssa",
-    "go/ssa/ssautil",
     "go/types/typeutil",
     "imports",
     "internal/fastwalk",
   ]
   pruneopts = "UT"
-  revision = "1b5a18146dea803d40d194b191359600da91665a"
+  revision = "7ca132754999accbaa5c1735eda29e7ce0f3bf03"
-  source = "github.com/golangci/tools"
 
 [[projects]]
   digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202"
@@ -524,51 +573,6 @@
   revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
   version = "v2.2.1"
 
-[[projects]]
-  branch = "master"
-  digest = "1:dd3808d5bdd7dfdbfe9b7412aa59b0a4c6fc6d9e3db25ba75465cc86e10def59"
-  name = "honnef.co/go/tools"
-  packages = [
-    "deprecated",
-    "functions",
-    "internal/sharedcheck",
-    "lint",
-    "lint/lintutil",
-    "simple",
-    "staticcheck",
-    "staticcheck/vrp",
-    "unused",
-    "version",
-  ]
-  pruneopts = "UT"
-  revision = "986cd2acf8dbf500b75aef5636a8107de6044e63"
-  source = "github.com/golangci/go-tools"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ef98efcb9462d27d251466fdc89656c5dbc28f4dc6b428a4270c3ba668ea412d"
-  name = "mvdan.cc/interfacer"
-  packages = ["check"]
-  pruneopts = "UT"
-  revision = "822e100dd73a2677e406ccc437efdb4a82e67033"
-
-[[projects]]
-  branch = "master"
-  digest = "1:521f15c98723cb42db85f5b83980ffa5f707ddaff12976a0d366e6a6cdd1f791"
-  name = "mvdan.cc/lint"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "adc824a0674b99099789b6188a058d485eaf61c0"
-
-[[projects]]
-  branch = "fix-crash-on-nil-constant"
-  digest = "1:f3f31fed50be4dad26688c0466c4d92de015ce4a3c0aa7e01b55326a77d1bf40"
-  name = "mvdan.cc/unparam"
-  packages = ["check"]
-  pruneopts = "UT"
-  revision = "f30d69ad8b55690d0e814cdd96e955834e0d0ee1"
-  source = "github.com/golangci/unparam"
-
 [[projects]]
   branch = "master"
   digest = "1:6a26dcb8f66d1110d3fa7b1cd097e450631bcd4f7a59a417b0f20d2646934a4a"
@@ -590,12 +594,18 @@
   analyzer-version = 1
   input-imports = [
     "github.com/OpenPeeDeeP/depguard",
-    "github.com/client9/misspell",
     "github.com/fatih/color",
     "github.com/golang/mock/gomock",
     "github.com/golangci/check/cmd/structcheck",
     "github.com/golangci/check/cmd/varcheck",
+    "github.com/golangci/dupl",
+    "github.com/golangci/errcheck/golangci",
     "github.com/golangci/go-misc/deadcode",
+    "github.com/golangci/go-tools/lint",
+    "github.com/golangci/go-tools/lint/lintutil",
+    "github.com/golangci/go-tools/simple",
+    "github.com/golangci/go-tools/staticcheck",
+    "github.com/golangci/go-tools/unused",
     "github.com/golangci/goconst",
     "github.com/golangci/gocyclo/pkg/gocyclo",
     "github.com/golangci/gofmt/gofmt",
@@ -604,14 +614,17 @@
     "github.com/golangci/gosec/rules",
     "github.com/golangci/govet",
     "github.com/golangci/ineffassign",
+    "github.com/golangci/interfacer/check",
     "github.com/golangci/lint-1",
     "github.com/golangci/maligned",
+    "github.com/golangci/misspell",
     "github.com/golangci/prealloc",
     "github.com/golangci/revgrep",
+    "github.com/golangci/tools/go/ssa",
+    "github.com/golangci/tools/go/ssa/ssautil",
     "github.com/golangci/unconvert",
-    "github.com/kisielk/errcheck/golangci",
+    "github.com/golangci/unparam/check",
     "github.com/mattn/go-colorable",
-    "github.com/mibk/dupl",
     "github.com/mitchellh/go-ps",
     "github.com/pkg/errors",
     "github.com/shirou/gopsutil/process",
@@ -621,15 +634,6 @@
     "github.com/spf13/viper",
     "github.com/stretchr/testify/assert",
     "golang.org/x/tools/go/loader",
-    "golang.org/x/tools/go/ssa",
-    "golang.org/x/tools/go/ssa/ssautil",
-    "honnef.co/go/tools/lint",
-    "honnef.co/go/tools/lint/lintutil",
-    "honnef.co/go/tools/simple",
-    "honnef.co/go/tools/staticcheck",
-    "honnef.co/go/tools/unused",
-    "mvdan.cc/interfacer/check",
-    "mvdan.cc/unparam/check",
     "sourcegraph.com/sourcegraph/go-diff/diff",
   ]
   solver-name = "gps-cdcl"

Gopkg.toml

@@ -10,25 +10,10 @@
   branch = "master"
   name = "sourcegraph.com/sourcegraph/go-diff"
 
-[[constraint]]
-  name = "github.com/kisielk/errcheck"
-  branch = "master"
-  source = "github.com/golangci/errcheck"
-
 [[constraint]]
   name = "github.com/golangci/govet"
   branch = "master"
 
-[[constraint]]
-  name = "github.com/mibk/dupl"
-  branch = "master"
-  source = "github.com/golangci/dupl"
-
-[[constraint]]
-  name = "mvdan.cc/unparam"
-  branch = "fix-crash-on-nil-constant"
-  source = "github.com/golangci/unparam"
-
 [prune]
   go-tests = true
   unused-packages = true
@@ -79,15 +64,4 @@
 
 [[constraint]]
   branch = "master"
-  name = "golang.org/x/tools"
+  name = "github.com/golangci/unparam"
-  source = "github.com/golangci/tools"
-
-[[constraint]]
-  branch = "master"
-  name = "honnef.co/go/tools"
-  source = "github.com/golangci/go-tools"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/client9/misspell"
-  source = "github.com/golangci/misspell"

pkg/golinters/dupl.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"go/token"
 
+	duplAPI "github.com/golangci/dupl"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/result"
-	duplAPI "github.com/mibk/dupl"
 )
 
 type Dupl struct{}

pkg/golinters/errcheck.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
+	errcheckAPI "github.com/golangci/errcheck/golangci"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/result"
-	errcheckAPI "github.com/kisielk/errcheck/golangci"
 )
 
 type Errcheck struct{}

pkg/golinters/interfacer.go

@@ -3,7 +3,7 @@ package golinters
 import (
 	"context"
 
-	"mvdan.cc/interfacer/check"
+	"github.com/golangci/interfacer/check"
 
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/result"

pkg/golinters/megacheck.go

@@ -6,13 +6,13 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/golangci/go-tools/lint"
+	"github.com/golangci/go-tools/lint/lintutil"
+	"github.com/golangci/go-tools/simple"
+	"github.com/golangci/go-tools/staticcheck"
+	"github.com/golangci/go-tools/unused"
+	"github.com/golangci/tools/go/ssa"
 	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"honnef.co/go/tools/lint"
-	"honnef.co/go/tools/lint/lintutil"
-	"honnef.co/go/tools/simple"
-	"honnef.co/go/tools/staticcheck"
-	"honnef.co/go/tools/unused"
 
 	"github.com/golangci/golangci-lint/pkg/fsutils"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"

pkg/golinters/misspell.go

@@ -7,9 +7,9 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/client9/misspell"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/result"
+	"github.com/golangci/misspell"
 )
 
 type Misspell struct{}

pkg/golinters/unparam.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/result"
-	"mvdan.cc/unparam/check"
+	"github.com/golangci/unparam/check"
 )
 
 type Unparam struct{}

pkg/lint/linter/context.go

@@ -5,8 +5,8 @@ import (
 	"github.com/golangci/golangci-lint/pkg/lint/astcache"
 	"github.com/golangci/golangci-lint/pkg/logutils"
 	"github.com/golangci/golangci-lint/pkg/packages"
+	"github.com/golangci/tools/go/ssa"
 	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
 )
 
 type Context struct {

pkg/lint/load.go

@@ -19,9 +19,9 @@ import (
 	"github.com/golangci/golangci-lint/pkg/lint/astcache"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
 	"github.com/golangci/golangci-lint/pkg/packages"
+	"github.com/golangci/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa/ssautil"
 	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
 )
 
 var loadDebugf = logutils.Debug("load")

vendor/github.com/golangci/dupl/README.md

@@ -12,7 +12,7 @@ tokens are completely different).
 ## Installation
 
 ```bash
-go get -u github.com/mibk/dupl
+go get -u github.com/golangci/dupl
 ```
 
 ## Usage
@@ -56,7 +56,7 @@ Examples:
 ## Example
 
 The reduced output of this command with the following parameters for the [Docker](https://www.docker.com) source code
-looks like [this](http://htmlpreview.github.io/?https://github.com/mibk/dupl/blob/master/_output_example/docker.html).
+looks like [this](http://htmlpreview.github.io/?https://github.com/golangci/dupl/blob/master/_output_example/docker.html).
 
 ```bash
 $ dupl -t 200 -html >docker.html

vendor/github.com/golangci/dupl/job/buildtree.go

@@ -1,8 +1,8 @@
 package job
 
 import (
-	"github.com/mibk/dupl/suffixtree"
+	"github.com/golangci/dupl/suffixtree"
-	"github.com/mibk/dupl/syntax"
+	"github.com/golangci/dupl/syntax"
 )
 
 func BuildTree(schan chan []*syntax.Node) (t *suffixtree.STree, d *[]*syntax.Node, done chan bool) {

vendor/github.com/golangci/dupl/job/parse.go

@@ -3,8 +3,8 @@ package job
 import (
 	"log"
 
-	"github.com/mibk/dupl/syntax"
+	"github.com/golangci/dupl/syntax"
-	"github.com/mibk/dupl/syntax/golang"
+	"github.com/golangci/dupl/syntax/golang"
 )
 
 func Parse(fchan chan string) chan []*syntax.Node {

vendor/github.com/golangci/dupl/main.go

@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/mibk/dupl/job"
+	"github.com/golangci/dupl/job"
-	"github.com/mibk/dupl/printer"
+	"github.com/golangci/dupl/printer"
-	"github.com/mibk/dupl/syntax"
+	"github.com/golangci/dupl/syntax"
 )
 
 const defaultThreshold = 15

vendor/github.com/golangci/dupl/printer/html.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"sort"
 
-	"github.com/mibk/dupl/syntax"
+	"github.com/golangci/dupl/syntax"
 )
 
 type html struct {

vendor/github.com/golangci/dupl/printer/plumbing.go

@@ -3,7 +3,7 @@ package printer
 import (
 	"sort"
 
-	"github.com/mibk/dupl/syntax"
+	"github.com/golangci/dupl/syntax"
 )
 
 type Clone clone

vendor/github.com/golangci/dupl/printer/printer.go

@@ -1,6 +1,6 @@
 package printer
 
-import "github.com/mibk/dupl/syntax"
+import "github.com/golangci/dupl/syntax"
 
 type ReadFile func(filename string) ([]byte, error)
 

vendor/github.com/golangci/dupl/printer/text.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"sort"
 
-	"github.com/mibk/dupl/syntax"
+	"github.com/golangci/dupl/syntax"
 )
 
 type text struct {

vendor/github.com/golangci/dupl/syntax/golang/golang.go

@@ -5,7 +5,7 @@ import (
 	"go/parser"
 	"go/token"
 
-	"github.com/mibk/dupl/syntax"
+	"github.com/golangci/dupl/syntax"
 )
 
 const (

vendor/github.com/golangci/dupl/syntax/syntax.go

@@ -3,7 +3,7 @@ package syntax
 import (
 	"crypto/sha1"
 
-	"github.com/mibk/dupl/suffixtree"
+	"github.com/golangci/dupl/suffixtree"
 )
 
 type Node struct {

vendor/github.com/golangci/errcheck/golangci/golangci.go

@@ -3,7 +3,7 @@ package golangci
 import (
 	"regexp"
 
-	"github.com/kisielk/errcheck/internal/errcheck"
+	"github.com/golangci/errcheck/internal/errcheck"
 	"golang.org/x/tools/go/loader"
 )
 

vendor/github.com/golangci/go-tools/functions/concrete.go

@@ -4,7 +4,7 @@ import (
 	"go/token"
 	"go/types"
 
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 )
 
 func concreteReturnTypes(fn *ssa.Function) []*types.Tuple {

vendor/github.com/golangci/go-tools/functions/functions.go

@@ -4,10 +4,10 @@ import (
 	"go/types"
 	"sync"
 
-	"golang.org/x/tools/go/callgraph"
+	"github.com/golangci/tools/go/callgraph"
-	"golang.org/x/tools/go/callgraph/static"
+	"github.com/golangci/tools/go/callgraph/static"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
-	"honnef.co/go/tools/staticcheck/vrp"
+	"github.com/golangci/go-tools/staticcheck/vrp"
 )
 
 var stdlibDescs = map[string]Description{

vendor/github.com/golangci/go-tools/functions/loops.go

@@ -1,6 +1,6 @@
 package functions
 
-import "golang.org/x/tools/go/ssa"
+import "github.com/golangci/tools/go/ssa"
 
 type Loop map[*ssa.BasicBlock]bool
 

vendor/github.com/golangci/go-tools/functions/pure.go

@@ -4,9 +4,9 @@ import (
 	"go/token"
 	"go/types"
 
-	"golang.org/x/tools/go/callgraph"
+	"github.com/golangci/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
-	"honnef.co/go/tools/lint"
+	"github.com/golangci/go-tools/lint"
 )
 
 // IsStub reports whether a function is a stub. A function is

vendor/github.com/golangci/go-tools/functions/terminates.go

@@ -1,6 +1,6 @@
 package functions
 
-import "golang.org/x/tools/go/ssa"
+import "github.com/golangci/tools/go/ssa"
 
 // terminates reports whether fn is supposed to return, that is if it
 // has at least one theoretic path that returns from the function.

vendor/github.com/golangci/go-tools/internal/sharedcheck/lint.go

@@ -4,8 +4,8 @@ import (
 	"go/ast"
 	"go/types"
 
-	"honnef.co/go/tools/lint"
+	"github.com/golangci/go-tools/lint"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 )
 
 func CheckRangeStringRunes(nodeFns map[ast.Node]*ssa.Function, j *lint.Job) {

vendor/github.com/golangci/go-tools/lint/lint.go

@@ -5,7 +5,7 @@
 // https://developers.google.com/open-source/licenses/bsd.
 
 // Package lint provides the foundation for tools like gosimple.
-package lint // import "honnef.co/go/tools/lint"
+package lint // import "github.com/golangci/go-tools/lint"
 
 import (
 	"bytes"
@@ -25,8 +25,8 @@ import (
 
 	"golang.org/x/tools/go/ast/astutil"
 	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
+	"github.com/golangci/tools/go/ssa/ssautil"
 )
 
 type Job struct {

vendor/github.com/golangci/go-tools/lint/lintutil/util.go

@@ -5,7 +5,7 @@
 // https://developers.google.com/open-source/licenses/bsd.
 
 // Package lintutil provides helpers for writing linter command lines.
-package lintutil // import "honnef.co/go/tools/lint/lintutil"
+package lintutil // import "github.com/golangci/go-tools/lint/lintutil"
 
 import (
 	"encoding/json"
@@ -20,9 +20,9 @@ import (
 	"strconv"
 	"strings"
 
-	"honnef.co/go/tools/lint"
+	"github.com/golangci/go-tools/lint"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
-	"honnef.co/go/tools/version"
+	"github.com/golangci/go-tools/version"
 
 	"golang.org/x/tools/go/loader"
 )

vendor/github.com/golangci/go-tools/simple/CONTRIBUTING.md

@@ -6,7 +6,7 @@
 
 Check you have the latest version of its dependencies. Run
 ```
-go get -u honnef.co/go/tools/simple
+go get -u github.com/golangci/go-tools/simple
 ```
 If you still have problems, consider searching for existing issues before filing a new issue.
 

vendor/github.com/golangci/go-tools/simple/lint.go

@@ -1,5 +1,5 @@
 // Package simple contains a linter for Go source code.
-package simple // import "honnef.co/go/tools/simple"
+package simple // import "github.com/golangci/go-tools/simple"
 
 import (
 	"go/ast"
@@ -9,9 +9,9 @@ import (
 	"reflect"
 	"strings"
 
-	"honnef.co/go/tools/internal/sharedcheck"
+	"github.com/golangci/go-tools/internal/sharedcheck"
-	"honnef.co/go/tools/lint"
+	"github.com/golangci/go-tools/lint"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 
 	"golang.org/x/tools/go/types/typeutil"
 )

vendor/github.com/golangci/go-tools/staticcheck/CONTRIBUTING.md

@@ -6,7 +6,7 @@
 
 Check you have the latest version of its dependencies. Run
 ```
-go get -u honnef.co/go/tools/staticcheck
+go get -u github.com/golangci/go-tools/staticcheck
 ```
 If you still have problems, consider searching for existing issues before filing a new issue.
 

vendor/github.com/golangci/go-tools/staticcheck/buildtag.go

@@ -4,7 +4,7 @@ import (
 	"go/ast"
 	"strings"
 
-	"honnef.co/go/tools/lint"
+	"github.com/golangci/go-tools/lint"
 )
 
 func buildTags(f *ast.File) [][]string {

vendor/github.com/golangci/go-tools/staticcheck/lint.go

@@ -1,5 +1,5 @@
 // Package staticcheck contains a linter for Go source code.
-package staticcheck // import "honnef.co/go/tools/staticcheck"
+package staticcheck // import "github.com/golangci/go-tools/staticcheck"
 
 import (
 	"fmt"
@@ -16,12 +16,12 @@ import (
 	"sync"
 	texttemplate "text/template"
 
-	"honnef.co/go/tools/deprecated"
+	"github.com/golangci/go-tools/deprecated"
-	"honnef.co/go/tools/functions"
+	"github.com/golangci/go-tools/functions"
-	"honnef.co/go/tools/internal/sharedcheck"
+	"github.com/golangci/go-tools/internal/sharedcheck"
-	"honnef.co/go/tools/lint"
+	"github.com/golangci/go-tools/lint"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
-	"honnef.co/go/tools/staticcheck/vrp"
+	"github.com/golangci/go-tools/staticcheck/vrp"
 
 	"golang.org/x/tools/go/ast/astutil"
 )

vendor/github.com/golangci/go-tools/staticcheck/rules.go

@@ -13,9 +13,9 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"honnef.co/go/tools/lint"
+	"github.com/golangci/go-tools/lint"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
-	"honnef.co/go/tools/staticcheck/vrp"
+	"github.com/golangci/go-tools/staticcheck/vrp"
 )
 
 const (

vendor/github.com/golangci/go-tools/staticcheck/vrp/channel.go

@@ -3,7 +3,7 @@ package vrp
 import (
 	"fmt"
 
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 )
 
 type ChannelInterval struct {

vendor/github.com/golangci/go-tools/staticcheck/vrp/int.go

@@ -6,7 +6,7 @@ import (
 	"go/types"
 	"math/big"
 
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 )
 
 type Zs []Z

vendor/github.com/golangci/go-tools/staticcheck/vrp/slice.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"go/types"
 
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 )
 
 type SliceInterval struct {

vendor/github.com/golangci/go-tools/staticcheck/vrp/string.go

@@ -5,7 +5,7 @@ import (
 	"go/token"
 	"go/types"
 
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 )
 
 type StringInterval struct {

vendor/github.com/golangci/go-tools/staticcheck/vrp/vrp.go

@@ -12,7 +12,7 @@ import (
 	"sort"
 	"strings"
 
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 )
 
 type Future interface {

vendor/github.com/golangci/go-tools/unused/unused.go

@@ -1,4 +1,4 @@
-package unused // import "honnef.co/go/tools/unused"
+package unused // import "github.com/golangci/go-tools/unused"
 
 import (
 	"fmt"
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"honnef.co/go/tools/lint"
+	"github.com/golangci/go-tools/lint"
 
 	"golang.org/x/tools/go/loader"
 	"golang.org/x/tools/go/types/typeutil"

vendor/github.com/golangci/interfacer/check/check.go

@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Daniel Martí <mvdan@mvdan.cc>
 // See LICENSE for licensing information
 
-package check // import "mvdan.cc/interfacer/check"
+package check // import "github.com/golangci/interfacer/check"
 
 import (
 	"fmt"
@@ -12,11 +12,11 @@ import (
 	"strings"
 
 	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
+	"github.com/golangci/tools/go/ssa/ssautil"
 
 	"github.com/kisielk/gotool"
-	"mvdan.cc/lint"
+	"github.com/golangci/lint"
 )
 
 func toDiscard(usage *varUsage) bool {

vendor/github.com/golangci/lint/lint.go

@@ -2,13 +2,13 @@
 // See LICENSE for licensing information
 
 // Package lint defines common interfaces for Go code checkers.
-package lint // import "mvdan.cc/lint"
+package lint // import "github.com/golangci/lint"
 
 import (
 	"go/token"
 
 	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 )
 
 // A Checker points out issues in a program.

vendor/github.com/golangci/tools/AUTHORS

@@ -0,0 +1,3 @@
+# This source code refers to The Go Authors for copyright purposes.
+# The master list of authors is in the main Go distribution,
+# visible at http://tip.golang.org/AUTHORS.

vendor/github.com/golangci/tools/CONTRIBUTORS

@@ -0,0 +1,3 @@
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at http://tip.golang.org/CONTRIBUTORS.

vendor/github.com/golangci/tools/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

vendor/github.com/golangci/tools/PATENTS

@@ -0,0 +1,22 @@
+Additional IP Rights Grant (Patents)
+
+"This implementation" means the copyrightable works distributed by
+Google as part of the Go project.
+
+Google hereby grants to You a perpetual, worldwide, non-exclusive,
+no-charge, royalty-free, irrevocable (except as stated in this section)
+patent license to make, have made, use, offer to sell, sell, import,
+transfer and otherwise run, modify and propagate the contents of this
+implementation of Go, where such license applies only to those patent
+claims, both currently owned or controlled by Google and acquired in
+the future, licensable by Google that are necessarily infringed by this
+implementation of Go.  This grant does not include claims that would be
+infringed only as a consequence of further modification of this
+implementation.  If you or your agent or exclusive licensee institute or
+order or agree to the institution of patent litigation against any
+entity (including a cross-claim or counterclaim in a lawsuit) alleging
+that this implementation of Go or any code incorporated within this
+implementation of Go constitutes direct or contributory patent
+infringement, or inducement of patent infringement, then any patent
+rights granted to you under this License for this implementation of Go
+shall terminate as of the date such litigation is filed.

vendor/github.com/golangci/tools/cmd/getgo/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2017 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

vendor/github.com/golangci/tools/go/callgraph/callgraph.go

@@ -32,7 +32,7 @@ in the call graph; they are treated like built-in operators of the
 language.
 
 */
-package callgraph // import "golang.org/x/tools/go/callgraph"
+package callgraph // import "github.com/golangci/tools/go/callgraph"
 
 // TODO(adonovan): add a function to eliminate wrappers from the
 // callgraph, preserving topology.
@@ -43,7 +43,7 @@ import (
 	"fmt"
 	"go/token"
 
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 )
 
 // A Graph represents a call graph.

vendor/github.com/golangci/tools/go/callgraph/cha/cha.go

@@ -21,14 +21,14 @@
 // and all concrete types are put into interfaces, it is sound to run on
 // partial programs, such as libraries without a main or test function.
 //
-package cha // import "golang.org/x/tools/go/callgraph/cha"
+package cha // import "github.com/golangci/tools/go/callgraph/cha"
 
 import (
 	"go/types"
 
-	"golang.org/x/tools/go/callgraph"
+	"github.com/golangci/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
+	"github.com/golangci/tools/go/ssa/ssautil"
 	"golang.org/x/tools/go/types/typeutil"
 )
 

vendor/github.com/golangci/tools/go/callgraph/rta/rta.go

@@ -40,7 +40,7 @@
 // cmd/callgraph tool on its own source takes ~2.1s for RTA and ~5.4s
 // for points-to analysis.
 //
-package rta // import "golang.org/x/tools/go/callgraph/rta"
+package rta // import "github.com/golangci/tools/go/callgraph/rta"
 
 // TODO(adonovan): test it by connecting it to the interpreter and
 // replacing all "unreachable" functions by a special intrinsic, and
@@ -50,8 +50,8 @@ import (
 	"fmt"
 	"go/types"
 
-	"golang.org/x/tools/go/callgraph"
+	"github.com/golangci/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
 	"golang.org/x/tools/go/types/typeutil"
 )
 

vendor/github.com/golangci/tools/go/callgraph/static/static.go

@@ -1,11 +1,11 @@
 // Package static computes the call graph of a Go program containing
 // only static call edges.
-package static // import "golang.org/x/tools/go/callgraph/static"
+package static // import "github.com/golangci/tools/go/callgraph/static"
 
 import (
-	"golang.org/x/tools/go/callgraph"
+	"github.com/golangci/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
+	"github.com/golangci/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
+	"github.com/golangci/tools/go/ssa/ssautil"
 )
 
 // CallGraph computes the call graph of the specified program

vendor/github.com/golangci/tools/go/callgraph/util.go

@@ -4,7 +4,7 @@
 
 package callgraph
 
-import "golang.org/x/tools/go/ssa"
+import "github.com/golangci/tools/go/ssa"
 
 // This file provides various utilities over call graphs, such as
 // visitation and path search.

vendor/github.com/golangci/tools/go/ssa/const.go

@@ -117,7 +117,7 @@ func (c *Const) IsNil() bool {
 	return c.Value == nil
 }
 
-// TODO(adonovan): move everything below into golang.org/x/tools/go/ssa/interp.
+// TODO(adonovan): move everything below into github.com/golangci/tools/go/ssa/interp.
 
 // Int64 returns the numeric value of this constant truncated to fit
 // a signed 64-bit integer.

vendor/github.com/golangci/tools/go/ssa/const15.go

@@ -117,7 +117,7 @@ func (c *Const) IsNil() bool {
 	return c.Value == nil
 }
 
-// TODO(adonovan): move everything below into golang.org/x/tools/go/ssa/interp.
+// TODO(adonovan): move everything below into github.com/golangci/tools/go/ssa/interp.
 
 // Int64 returns the numeric value of this constant truncated to fit
 // a signed 64-bit integer.

vendor/github.com/golangci/tools/go/ssa/doc.go

@@ -120,4 +120,4 @@
 // domains of source locations, ast.Nodes, types.Objects,
 // ssa.Values/Instructions.
 //
-package ssa // import "golang.org/x/tools/go/ssa"
+package ssa // import "github.com/golangci/tools/go/ssa"