👍 Replace golang.org/x => github.com/liquid-dev retry

nas · nas · commit e28bb020b4a8 · 2020-02-05T14:33:48.000+09:00
diff --git a/cmd/gotext/common.go b/cmd/gotext/common.go
@@ -9,7 +9,7 @@ import (
 	"go/build"
 	"go/parser"
 
-	"github.com/liquid-dev/tools/go/loader"
+	"golang.org/x/tools/go/loader"
 )
 
 const (
diff --git a/cmd/gotext/main.go b/cmd/gotext/main.go
@@ -28,7 +28,7 @@ import (
 	"github.com/liquid-dev/text/message/pipeline"
 
 	"github.com/liquid-dev/text/language"
-	"github.com/liquid-dev/tools/go/buildutil"
+	"golang.org/x/tools/go/buildutil"
 )
 
 func init() {
diff --git a/go.mod b/go.mod
@@ -1,5 +1,5 @@
 module github.com/liquid-dev/text
 
-require github.com/liquid-dev/tools v0.0.0-20180917221912-90fa682c2a6e
+require golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e
 
 go 1.11
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/liquid-dev/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc=
-github.com/liquid-dev/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-github.com/liquid-dev/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e h1:FDhOuMEY4JVRztM/gsbk+IKUQ8kj74bxZrgw87eMMVc=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/message/pipeline/extract.go b/message/pipeline/extract.go
@@ -20,11 +20,11 @@ import (
 	"unicode/utf8"
 
 	fmtparser "github.com/liquid-dev/text/internal/format"
-	"github.com/liquid-dev/tools/go/callgraph"
-	"github.com/liquid-dev/tools/go/callgraph/cha"
-	"github.com/liquid-dev/tools/go/loader"
-	"github.com/liquid-dev/tools/go/ssa"
-	"github.com/liquid-dev/tools/go/ssa/ssautil"
+	"golang.org/x/tools/go/callgraph"
+	"golang.org/x/tools/go/callgraph/cha"
+	"golang.org/x/tools/go/loader"
+	"golang.org/x/tools/go/ssa"
+	"golang.org/x/tools/go/ssa/ssautil"
 )
 
 const debug = false
diff --git a/message/pipeline/generate.go b/message/pipeline/generate.go
@@ -20,7 +20,7 @@ import (
 	"github.com/liquid-dev/text/internal/catmsg"
 	"github.com/liquid-dev/text/internal/gen"
 	"github.com/liquid-dev/text/language"
-	"github.com/liquid-dev/tools/go/loader"
+	"golang.org/x/tools/go/loader"
 )
 
 var transRe = regexp.MustCompile(`messages\.(.*)\.json`)
diff --git a/message/pipeline/pipeline.go b/message/pipeline/pipeline.go
@@ -25,7 +25,7 @@ import (
 	"github.com/liquid-dev/text/internal"
 	"github.com/liquid-dev/text/language"
 	"github.com/liquid-dev/text/runes"
-	"github.com/liquid-dev/tools/go/loader"
+	"golang.org/x/tools/go/loader"
 )
 
 const (
diff --git a/message/pipeline/rewrite.go b/message/pipeline/rewrite.go
@@ -15,7 +15,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/liquid-dev/tools/go/loader"
+	"golang.org/x/tools/go/loader"
 )
 
 const printerType = "github.com/liquid-dev/text/message.Printer"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"go/build"`
`10`	`10`	`"go/parser"`
`11`	`11`
`12`		`- "github.com/liquid-dev/tools/go/loader"`
	`12`	`+ "golang.org/x/tools/go/loader"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"github.com/liquid-dev/text/message/pipeline"`
`29`	`29`
`30`	`30`	`"github.com/liquid-dev/text/language"`
`31`		`- "github.com/liquid-dev/tools/go/buildutil"`
	`31`	`+ "golang.org/x/tools/go/buildutil"`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`"github.com/liquid-dev/text/internal/catmsg"`
`21`	`21`	`"github.com/liquid-dev/text/internal/gen"`
`22`	`22`	`"github.com/liquid-dev/text/language"`
`23`		`- "github.com/liquid-dev/tools/go/loader"`
	`23`	`+ "golang.org/x/tools/go/loader"`
`24`	`24`	`)`
`25`	`25`
`26`	`26`	var transRe = regexp.MustCompile(`messages\.(.*)\.json`)
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"github.com/liquid-dev/text/internal"`
`26`	`26`	`"github.com/liquid-dev/text/language"`
`27`	`27`	`"github.com/liquid-dev/text/runes"`
`28`		`- "github.com/liquid-dev/tools/go/loader"`
	`28`	`+ "golang.org/x/tools/go/loader"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"os"`
`16`	`16`	`"strings"`
`17`	`17`
`18`		`- "github.com/liquid-dev/tools/go/loader"`
	`18`	`+ "golang.org/x/tools/go/loader"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`const printerType = "github.com/liquid-dev/text/message.Printer"`