Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-10-31 18:23:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

pkg/fall: make Zero and Root vars not funcs (#1367)

Browse Source 
These can be just vars. Think that was intended as well.
This commit is contained in:
Miek Gieben
2018-01-09 22:29:19 +00:00
committed by GitHub
parent a19ea63d3a
commit cced1a4c12
5 changed files with 51 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/pkg/fall/fall.go
View File

@@ -28,7 +28,7 @@ func (f *F) setZones(zones []string) {
// SetZonesFromArgs sets zones in f to the passed value or to "." if the slice is empty.
func (f *F) SetZonesFromArgs(zones []string) {
if len(zones) == 0 {
f.setZones(Root().Zones)
f.setZones(Root.Zones)
return
}
f.setZones(zones)
@@ -50,9 +50,9 @@ func (f F) Equal(g F) bool {
// Zero returns a zero valued F.
var Zero = func() F {
return F{[]string{}}
}
}()
// Root returns F set to only ".".
var Root = func() F {
return F{[]string{"."}}
}
}()

4
plugin/pkg/fall/fall_test.go
View File

@@ -23,7 +23,7 @@ func TestEqual(t *testing.T) {
func TestZero(t *testing.T) {
var f F
if !f.Equal(Zero()) {
if !f.Equal(Zero) {
t.Errorf("F should be zero")
}
}
@@ -31,7 +31,7 @@ func TestZero(t *testing.T) {
func TestSetZonesFromArgs(t *testing.T) {
var f F
f.SetZonesFromArgs([]string{})
if !f.Equal(Root()) {
if !f.Equal(Root) {
t.Errorf("F should have the root zone")
}