Skip to content
This repository was archived by the owner on Jul 7, 2020. It is now read-only.

Fix issue with gcimporter and go/types #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gotoinline/gotoinline.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"go/token"
"strings"

"golang.org/x/tools/go/types"
"go/types"

"rsc.io/grind/block"
"rsc.io/grind/grinder"
Expand Down
2 changes: 1 addition & 1 deletion grinder/ast.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"go/ast"
"go/token"

"golang.org/x/tools/go/types"
"go/types"

"rsc.io/grind/block"
)
Expand Down
5 changes: 3 additions & 2 deletions grinder/grind.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ import (
"path/filepath"
"strings"

_ "golang.org/x/tools/go/gcimporter"
"golang.org/x/tools/go/types"
"go/types"

_ "golang.org/x/tools/go/gcimporter15"
)

type Package struct {
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion vardecl/vardecl.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"go/token"
"strings"

"golang.org/x/tools/go/types"
"go/types"

"rsc.io/grind/block"
"rsc.io/grind/flow"
Expand Down