rename SetOr to SetDefault

Author: mkideal

container/tree/tree.go

@@ -109,14 +109,14 @@ var defaultOptions = &Options{
 
 // Fix ensures all options have valid values, using defaults where necessary.
 func (options *Options) Fix() {
-	op.SetOr(&options.Parent, defaultOptions.Parent)
+	op.SetDefault(&options.Parent, defaultOptions.Parent)
 	if options.Branch == "" {
 		options.Branch = defaultOptions.Branch
-		op.SetOr(&options.LastBranch, defaultOptions.LastBranch)
+		op.SetDefault(&options.LastBranch, defaultOptions.LastBranch)
 	} else if options.LastBranch == "" {
 		options.LastBranch = options.Branch
 	}
-	op.SetOr(&options.Space, defaultOptions.Space)
+	op.SetDefault(&options.Space, defaultOptions.Space)
 }
 
 // Stringify converts a node to a string representation.

op/op.go

@@ -24,19 +24,19 @@ func OrFunc[T comparable](a T, b func() T) T {
 	return a
 }
 
-// SetOr sets the value of a to b if a is the zero value for T.
+// SetDefault sets the value of a to b if a is the zero value for T.
 // It returns the final value of a.
-func SetOr[T comparable](a *T, b T) T {
+func SetDefault[T comparable](a *T, b T) T {
 	var zero T
 	if *a == zero {
 		*a = b
 	}
 	return *a
 }
 
-// SetOrFunc sets the value of a to the result of calling b() if a is
+// SetDefaultFunc sets the value of a to the result of calling b() if a is
 // the zero value for T. It returns the final value of a.
-func SetOrFunc[T comparable](a *T, b func() T) T {
+func SetDefaultFunc[T comparable](a *T, b func() T) T {
 	var zero T
 	if *a == zero {
 		*a = b()

op/op_test.go

@@ -70,7 +70,7 @@ func TestOrFunc(t *testing.T) {
 	}
 }
 
-func TestSetOr(t *testing.T) {
+func TestSetDefault(t *testing.T) {
 	tests := []struct {
 		name       string
 		a, b, want int
@@ -82,14 +82,14 @@ func TestSetOr(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			a := tt.a
-			if got := op.SetOr(&a, tt.b); got != tt.want || a != tt.want {
-				t.Errorf("SetOr(&%v, %v) = %v, want %v, a = %v, want %v", tt.a, tt.b, got, tt.want, a, tt.want)
+			if got := op.SetDefault(&a, tt.b); got != tt.want || a != tt.want {
+				t.Errorf("SetDefault(&%v, %v) = %v, want %v, a = %v, want %v", tt.a, tt.b, got, tt.want, a, tt.want)
 			}
 		})
 	}
 }
 
-func TestSetOrFunc(t *testing.T) {
+func TestSetDefaultFunc(t *testing.T) {
 	tests := []struct {
 		name string
 		a    int
@@ -103,8 +103,8 @@ func TestSetOrFunc(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			a := tt.a
-			if got := op.SetOrFunc(&a, tt.b); got != tt.want || a != tt.want {
-				t.Errorf("SetOrFunc(&%v, func()) = %v, want %v, a = %v, want %v", tt.a, got, tt.want, a, tt.want)
+			if got := op.SetDefaultFunc(&a, tt.b); got != tt.want || a != tt.want {
+				t.Errorf("SetDefaultFunc(&%v, func()) = %v, want %v, a = %v, want %v", tt.a, got, tt.want, a, tt.want)
 			}
 		})
 	}