diff options
| author | Felix Hanley <felix@userspace.com.au> | 2018-10-23 10:28:58 +1100 |
|---|---|---|
| committer | Robert <rw@users.noreply.github.com> | 2018-10-22 16:28:58 -0700 |
| commit | 560718e97633ab766a115ebb4e68f985b423b6ea (patch) | |
| tree | d5a399ea115c50dea076ade31b69c43c415542ff /grpc | |
| parent | ff687ae9c1df7909744e36f3dde05e10202e9542 (diff) | |
| download | flatbuffers-560718e97633ab766a115ebb4e68f985b423b6ea.tar.gz flatbuffers-560718e97633ab766a115ebb4e68f985b423b6ea.tar.bz2 flatbuffers-560718e97633ab766a115ebb4e68f985b423b6ea.zip | |
Use stdlib context in generated Go files (#4904)
Diffstat (limited to 'grpc')
| -rw-r--r-- | grpc/src/compiler/go_generator.cc | 2 | ||||
| -rw-r--r-- | grpc/tests/go_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/grpc/src/compiler/go_generator.cc b/grpc/src/compiler/go_generator.cc index d620089a..604828d6 100644 --- a/grpc/src/compiler/go_generator.cc +++ b/grpc/src/compiler/go_generator.cc @@ -84,7 +84,7 @@ void GenerateImports(grpc_generator::File *file, grpc_generator::Printer *printe } printer->Print("import (\n"); printer->Indent(); - printer->Print(vars, "$context$ \"golang.org/x/net/context\"\n"); + printer->Print(vars, "$context$ \"context\"\n"); printer->Print(vars, "$grpc$ \"google.golang.org/grpc\"\n"); printer->Outdent(); printer->Print(")\n\n"); diff --git a/grpc/tests/go_test.go b/grpc/tests/go_test.go index 7192f972..288036bc 100644 --- a/grpc/tests/go_test.go +++ b/grpc/tests/go_test.go @@ -3,10 +3,10 @@ package testing import ( "../../tests/MyGame/Example" + "context" "net" "testing" - "golang.org/x/net/context" "google.golang.org/grpc" ) |