all: use new protogen options API

dsnet · dsnet · commit a3619c1acae2 · 2020-02-28T23:19:22.000Z
Change-Id: Ib7ef4f9e8a6b7ada1f0cba4ae706be9fb8f7a10c Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/221559 Reviewed-by: Damien Neil <dneil@google.com>
diff --git a/go.mod b/go.mod
@@ -4,5 +4,5 @@ go 1.9
 
 require (
 	github.com/google/go-cmp v0.4.0
-	google.golang.org/protobuf v0.0.0-20200225203307-f6cf4925a90e
+	google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60
 )
diff --git a/go.sum b/go.sum
@@ -8,5 +8,5 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IV
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200225203307-f6cf4925a90e h1:wrJFqPhiw6ByHbcNMcv/+6kk7HQLewtkSxANqkwtQ/0=
-google.golang.org/protobuf v0.0.0-20200225203307-f6cf4925a90e/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60 h1:qkfzMNEf79BNs1//mQGZjYHIXAOv+AOdvPnMsU6R+1I=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
diff --git a/internal/cmd/generate-alias/main.go b/internal/cmd/generate-alias/main.go
@@ -82,7 +82,7 @@ func main() {
 	}
 
 	// Use the internal logic of protoc-gen-go to generate the files.
-	gen, err := protogen.New(&req, nil)
+	gen, err := protogen.Options{}.New(&req)
 	check(err)
 	for _, file := range gen.Files {
 		if file.Generate {
diff --git a/protoc-gen-go/main.go b/protoc-gen-go/main.go
@@ -45,11 +45,10 @@ func main() {
 		}
 		return importPath
 	}
-	opts := &protogen.Options{
+	protogen.Options{
 		ParamFunc:         flags.Set,
 		ImportRewriteFunc: importRewriteFunc,
-	}
-	protogen.Run(opts, func(gen *protogen.Plugin) error {
+	}.Run(func(gen *protogen.Plugin) error {
 		grpc := false
 		for _, plugin := range strings.Split(*plugins, ",") {
 			switch plugin {

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ go 1.9`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/google/go-cmp v0.4.0`
`7`		`- google.golang.org/protobuf v0.0.0-20200225203307-f6cf4925a90e`
	`7`	`+ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func main() {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`// Use the internal logic of protoc-gen-go to generate the files.`
`85`		`- gen, err := protogen.New(&req, nil)`
	`85`	`+ gen, err := protogen.Options{}.New(&req)`
`86`	`86`	`check(err)`
`87`	`87`	`for _, file := range gen.Files {`
`88`	`88`	`if file.Generate {`
Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,10 @@ func main() {`
`45`	`45`	`}`
`46`	`46`	`return importPath`
`47`	`47`	`}`
`48`		`- opts := &protogen.Options{`
	`48`	`+ protogen.Options{`
`49`	`49`	`ParamFunc: flags.Set,`
`50`	`50`	`ImportRewriteFunc: importRewriteFunc,`
`51`		`- }`
`52`		`- protogen.Run(opts, func(gen *protogen.Plugin) error {`
	`51`	`+ }.Run(func(gen *protogen.Plugin) error {`
`53`	`52`	`grpc := false`
`54`	`53`	`for _, plugin := range strings.Split(*plugins, ",") {`
`55`	`54`	`switch plugin {`