From 484f5491afa87d93d29ff234c9677bc6e6868845 Mon Sep 17 00:00:00 2001 From: Davide D'Agostino Date: Wed, 25 May 2016 12:04:35 -0700 Subject: [PATCH 1/2] Use gcimporter15 This fix #12 --- grinder/grind.go | 2 +- main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/grinder/grind.go b/grinder/grind.go index f2e7bfe..63b8555 100644 --- a/grinder/grind.go +++ b/grinder/grind.go @@ -17,7 +17,7 @@ import ( "path/filepath" "strings" - _ "golang.org/x/tools/go/gcimporter" + _ "golang.org/x/tools/go/gcimporter15" "golang.org/x/tools/go/types" ) diff --git a/main.go b/main.go index fdca2d1..e5b1e60 100644 --- a/main.go +++ b/main.go @@ -13,7 +13,7 @@ import ( "os/exec" "strings" - _ "golang.org/x/tools/go/gcimporter" + _ "golang.org/x/tools/go/gcimporter15" "rsc.io/grind/deadcode" "rsc.io/grind/gotoinline" "rsc.io/grind/grinder" From 38f8337c331a5bfaf6b5375cfe8d4dc402bb6286 Mon Sep 17 00:00:00 2001 From: Davide D'Agostino Date: Wed, 25 May 2016 12:13:00 -0700 Subject: [PATCH 2/2] Use "go/types" of stdlib rather than x/tools The latter isn't available anymore. Fix issue #14 --- gotoinline/gotoinline.go | 2 +- grinder/ast.go | 2 +- grinder/grind.go | 3 ++- vardecl/vardecl.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gotoinline/gotoinline.go b/gotoinline/gotoinline.go index 98dbfeb..42ec1c7 100644 --- a/gotoinline/gotoinline.go +++ b/gotoinline/gotoinline.go @@ -10,7 +10,7 @@ import ( "go/token" "strings" - "golang.org/x/tools/go/types" + "go/types" "rsc.io/grind/block" "rsc.io/grind/grinder" diff --git a/grinder/ast.go b/grinder/ast.go index 2aa2609..0e619d2 100644 --- a/grinder/ast.go +++ b/grinder/ast.go @@ -8,7 +8,7 @@ import ( "go/ast" "go/token" - "golang.org/x/tools/go/types" + "go/types" "rsc.io/grind/block" ) diff --git a/grinder/grind.go b/grinder/grind.go index 63b8555..0648b2a 100644 --- a/grinder/grind.go +++ b/grinder/grind.go @@ -17,8 +17,9 @@ import ( "path/filepath" "strings" + "go/types" + _ "golang.org/x/tools/go/gcimporter15" - "golang.org/x/tools/go/types" ) type Package struct { diff --git a/vardecl/vardecl.go b/vardecl/vardecl.go index 835993a..3b4573e 100644 --- a/vardecl/vardecl.go +++ b/vardecl/vardecl.go @@ -11,7 +11,7 @@ import ( "go/token" "strings" - "golang.org/x/tools/go/types" + "go/types" "rsc.io/grind/block" "rsc.io/grind/flow"