refactor(json): move go.starlark.net/starlarkjson -> go.starlark.net/…

…lib/json (google#367) and keep an alias package in place for backwards compatibility
vasyharan · Apr 16, 2021 · 1607a96 · 1607a96
1 parent 7a1108e
commit 1607a96
Show file tree

Hide file tree

Showing 5 changed files with 492 additions and 476 deletions.
diff --git a/cmd/starlark/starlark.go b/cmd/starlark/starlark.go
@@ -16,12 +16,12 @@ import (
 	"strings"
 
 	"go.starlark.net/internal/compile"
+	"go.starlark.net/lib/json"
 	"go.starlark.net/lib/math"
 	"go.starlark.net/lib/time"
 	"go.starlark.net/repl"
 	"go.starlark.net/resolve"
 	"go.starlark.net/starlark"
-	"go.starlark.net/starlarkjson"
 )
 
 // flags
@@ -92,7 +92,7 @@ func doMain() int {
 
 	// Ideally this statement would update the predeclared environment.
 	// TODO(adonovan): plumb predeclared env through to the REPL.
-	starlark.Universe["json"] = starlarkjson.Module
+	starlark.Universe["json"] = json.Module
 	starlark.Universe["time"] = time.Module
 	starlark.Universe["math"] = math.Module