fix more build errors with renaming

emer · Apr 15, 2024 · a389e50 · a389e50
1 parent 0bf32ed
commit a389e50
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/econfig/args.go b/econfig/args.go
@@ -226,10 +226,10 @@ func fieldArgNamesStruct(obj any, path string, nest bool, allArgs map[string]ref
 					nwNest = true
 				}
 			}
-			fieldArgNamesStruct(reflectx.PtrValue(fv).Interface(), nwPath, nwNest, allArgs)
+			fieldArgNamesStruct(reflectx.PointerValue(fv).Interface(), nwPath, nwNest, allArgs)
 			continue
 		}
-		pval := reflectx.PtrValue(fv)
+		pval := reflectx.PointerValue(fv)
 		addAllCases(f.Name, path, pval, allArgs)
 		if f.Type.Kind() == reflect.Bool {
 			addAllCases("No"+f.Name, path, pval, allArgs)

diff --git a/econfig/usage.go b/econfig/usage.go
@@ -38,7 +38,7 @@ func usageStruct(obj any, path string, b *strings.Builder) {
 			if path != "" {
 				nwPath = path + "." + nwPath
 			}
-			usageStruct(reflectx.PtrValue(fv).Interface(), nwPath, b)
+			usageStruct(reflectx.PointerValue(fv).Interface(), nwPath, b)
 			continue
 		}
 		nm := f.Name

diff --git a/ekube/main.go b/ekube/main.go
@@ -6,11 +6,11 @@
 // and the deployment of those images to Kubernetes clusters.
 package main
 
-//go:generate core generate
+import "cogentcore.org/core/cli"
 
-import "cogentcore.org/core/grease"
+//go:generate core generate
 
 func main() {
-	opts := grease.DefaultOptions("ekube", "ekube provides easy building of Docker images for emergent models and the deployment of those images to Kubernetes clusters.")
-	grease.Run(opts, &Config{}, Build)
+	opts := cli.DefaultOptions("ekube", "ekube provides easy building of Docker images for emergent models and the deployment of those images to Kubernetes clusters.")
+	cli.Run(opts, &Config{}, Build)
 }
diff --git a/netparams/io.go b/netparams/io.go
@@ -14,11 +14,11 @@ import (
 
 	"cogentcore.org/core/core"
 	"cogentcore.org/core/gox/indent"
+	"cogentcore.org/core/iox"
 	"cogentcore.org/core/iox/jsonx"
 	"cogentcore.org/core/iox/tomlx"
 	"github.com/BurntSushi/toml"
 	"github.com/emer/emergent/v2/params"
-	"goki.dev/grows"
 )
 
 // WriteGoPrelude writes the start of a go file in package main that starts a
@@ -56,7 +56,7 @@ func (pr *Sets) OpenTOML(filename core.Filename) error {
 // SaveTOML saves params to a TOML-formatted file.
 func (pr *Sets) SaveTOML(filename core.Filename) error {
 	// return tomlx.Save(pr, string(filename)) // pelletier/go-toml produces bad output on maps
-	return grows.Save(pr, string(filename), func(w io.Writer) grows.Encoder {
+	return iox.Save(pr, string(filename), func(w io.Writer) iox.Encoder {
 		return toml.NewEncoder(w)
 	})
 }

diff --git a/params/io.go b/params/io.go
@@ -16,10 +16,10 @@ import (
 
 	"cogentcore.org/core/core"
 	"cogentcore.org/core/gox/indent"
+	"cogentcore.org/core/iox"
 	"cogentcore.org/core/iox/jsonx"
 	"cogentcore.org/core/iox/tomlx"
 	"github.com/BurntSushi/toml"
-	"goki.dev/grows"
 	"golang.org/x/exp/maps"
 )
 
@@ -52,7 +52,7 @@ func (pr *Params) OpenTOML(filename core.Filename) error {
 // SaveTOML saves params to a TOML-formatted file.
 func (pr *Params) SaveTOML(filename core.Filename) error {
 	// return tomlx.Save(pr, string(filename)) // pelletier/go-toml produces bad output on maps
-	return grows.Save(pr, string(filename), func(w io.Writer) grows.Encoder {
+	return iox.Save(pr, string(filename), func(w io.Writer) iox.Encoder {
 		return toml.NewEncoder(w)
 	})
 }
@@ -126,7 +126,7 @@ func (pr *Hypers) OpenTOML(filename core.Filename) error {
 // SaveTOML saves params to a TOML-formatted file.
 func (pr *Hypers) SaveTOML(filename core.Filename) error {
 	// return tomlx.Save(pr, string(filename))
-	return grows.Save(pr, string(filename), func(w io.Writer) grows.Encoder {
+	return iox.Save(pr, string(filename), func(w io.Writer) iox.Encoder {
 		return toml.NewEncoder(w)
 	})
 }
@@ -200,7 +200,7 @@ func (pr *Sel) OpenTOML(filename core.Filename) error {
 // SaveTOML saves params to a TOML-formatted file.
 func (pr *Sel) SaveTOML(filename core.Filename) error {
 	// return tomlx.Save(pr, string(filename))
-	return grows.Save(pr, string(filename), func(w io.Writer) grows.Encoder {
+	return iox.Save(pr, string(filename), func(w io.Writer) iox.Encoder {
 		return toml.NewEncoder(w)
 	})
 }
@@ -266,7 +266,7 @@ func (pr *Sheet) OpenTOML(filename core.Filename) error {
 // SaveTOML saves params to a TOML-formatted file.
 func (pr *Sheet) SaveTOML(filename core.Filename) error {
 	// return tomlx.Save(pr, string(filename))
-	return grows.Save(pr, string(filename), func(w io.Writer) grows.Encoder {
+	return iox.Save(pr, string(filename), func(w io.Writer) iox.Encoder {
 		return toml.NewEncoder(w)
 	})
 }
@@ -334,7 +334,7 @@ func (pr *Sheets) OpenTOML(filename core.Filename) error {
 // SaveTOML saves params to a TOML-formatted file.
 func (pr *Sheets) SaveTOML(filename core.Filename) error {
 	// return tomlx.Save(pr, string(filename))
-	return grows.Save(pr, string(filename), func(w io.Writer) grows.Encoder {
+	return iox.Save(pr, string(filename), func(w io.Writer) iox.Encoder {
 		return toml.NewEncoder(w)
 	})
 }
@@ -407,7 +407,7 @@ func (pr *Set) OpenTOML(filename core.Filename) error {
 // SaveTOML saves params to a TOML-formatted file.
 func (pr *Set) SaveTOML(filename core.Filename) error {
 	// return tomlx.Save(pr, string(filename))
-	return grows.Save(pr, string(filename), func(w io.Writer) grows.Encoder {
+	return iox.Save(pr, string(filename), func(w io.Writer) iox.Encoder {
 		return toml.NewEncoder(w)
 	})
 }
@@ -446,7 +446,7 @@ func (pr *Sets) OpenTOML(filename core.Filename) error {
 // SaveTOML saves params to a TOML-formatted file.
 func (pr *Sets) SaveTOML(filename core.Filename) error {
 	// return tomlx.Save(pr, string(filename))
-	return grows.Save(pr, string(filename), func(w io.Writer) grows.Encoder {
+	return iox.Save(pr, string(filename), func(w io.Writer) iox.Encoder {
 		return toml.NewEncoder(w)
 	})
 }