all: move back to github.com/google/go-cloud (google/go-cloud#162)

Reverts changes made in google/go-cloud#120 for google/go-cloud#117

internal/wire/parse.go

@@ -653,7 +653,7 @@ func isWireImport(path string) bool {
 	if i := strings.LastIndex(path, vendorPart); i != -1 && (i == 0 || path[i-1] == '/') {
 		path = path[i+len(vendorPart):]
 	}
-	return path == "github.com/google/go-x-cloud/wire"
+	return path == "github.com/google/go-cloud/wire"
 }
 
 // ProviderOrValue is a pointer to a Provider or a Value. The zero value is

internal/wire/testdata/Chain/foo/foo.go

@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/Chain/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {

internal/wire/testdata/Cleanup/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectBar() (*Bar, func()) {

internal/wire/testdata/CopyOtherDecls/foo/foo.go

@@ -22,7 +22,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/Cycle/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedBaz() Baz {

internal/wire/testdata/EmptyVar/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {

internal/wire/testdata/ExportedValue/bar/bar.go

@@ -14,7 +14,7 @@
 
 package bar
 
-import "github.com/google/go-x-cloud/wire"
+import "github.com/google/go-cloud/wire"
 
 var Value = wire.Value(PublicMsg)
 

internal/wire/testdata/ExportedValue/foo/wire.go

@@ -18,7 +18,7 @@ package main
 
 import (
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {

internal/wire/testdata/ExportedValueDifferentPackage/bar/bar.go

@@ -17,7 +17,7 @@ package bar
 import (
 	"os"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 var Value = wire.Value(os.Stdout)

internal/wire/testdata/ExportedValueDifferentPackage/foo/wire.go

@@ -20,7 +20,7 @@ import (
 	"os"
 
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedFile() *os.File {

internal/wire/testdata/ImportedInterfaceBinding/bar/bar.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"foo"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/ImportedInterfaceBinding/bar/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 	"foo"
 )
 

internal/wire/testdata/InjectInput/foo/foo.go

@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/InjectInput/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar(foo Foo) FooBar {

internal/wire/testdata/InjectInputConflict/foo/foo.go

@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/InjectInputConflict/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectBar(foo Foo) Bar {

internal/wire/testdata/InjectWithReturn/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {

internal/wire/testdata/InterfaceBinding/foo/foo.go

@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/InterfaceBinding/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooer() Fooer {

internal/wire/testdata/InterfaceBindingReuse/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {

internal/wire/testdata/NamingWorstCase/foo/wire.go

@@ -19,7 +19,7 @@ package main
 import (
 	stdcontext "context"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func inject(context stdcontext.Context, err struct{}) (context, error) {

internal/wire/testdata/NamingWorstCaseAllInOne/foo/foo.go

@@ -25,7 +25,7 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 type context struct{}

internal/wire/testdata/NiladicIdentity/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {

internal/wire/testdata/NiladicValue/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {

internal/wire/testdata/NoImplicitInterface/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooer() Fooer {

internal/wire/testdata/NoInjectParamNames/foo/wire.go

@@ -19,7 +19,7 @@ package main
 import (
 	stdcontext "context"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 // The notable characteristic of this test is that there are no

internal/wire/testdata/PartialCleanup/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectBaz() (Baz, func(), error) {

internal/wire/testdata/PkgImport/foo/foo.go

@@ -18,7 +18,7 @@ import (
 	"fmt"
 
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/PkgImport/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {

internal/wire/testdata/ReturnError/foo/foo.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/ReturnError/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFoo() (Foo, error) {

internal/wire/testdata/Struct/foo/foo.go

@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/Struct/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {

internal/wire/testdata/StructPointer/foo/foo.go

@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/StructPointer/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() *FooBar {

internal/wire/testdata/TwoDeps/foo/foo.go

@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/TwoDeps/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {

internal/wire/testdata/UnexportedValue/bar/bar.go

@@ -14,7 +14,7 @@
 
 package bar
 
-import "github.com/google/go-x-cloud/wire"
+import "github.com/google/go-cloud/wire"
 
 var Value = wire.Value(privateMsg)
 

internal/wire/testdata/UnexportedValue/foo/wire.go

@@ -18,7 +18,7 @@ package main
 
 import (
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {

internal/wire/testdata/ValueChain/foo/foo.go

@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func main() {

internal/wire/testdata/ValueChain/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectFooBar() FooBar {

internal/wire/testdata/ValueConversion/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() Foo {

internal/wire/testdata/VarValue/foo/wire.go

@@ -17,7 +17,7 @@
 package main
 
 import (
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {

internal/wire/testdata/Vendor/foo/wire.go

@@ -18,7 +18,7 @@ package main
 
 import (
 	"bar"
-	"github.com/google/go-x-cloud/wire"
+	"github.com/google/go-cloud/wire"
 )
 
 func injectedMessage() string {

internal/wire/wire_test.go

@@ -309,7 +309,7 @@ func loadTestCase(root string, wireGoSrc []byte) (*testCase, error) {
 		out = nil
 	}
 	goFiles := map[string][]byte{
-		"github.com/google/go-x-cloud/wire/wire.go": wireGoSrc,
+		"github.com/google/go-cloud/wire/wire.go": wireGoSrc,
 	}
 	err = filepath.Walk(root, func(src string, info os.FileInfo, err error) error {
 		if err != nil {