Skip to content

Commit

Permalink
caddyconfig: Use empty struct instead of bool in map (close #6224) (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
danish-mehmood authored Apr 8, 2024
1 parent a4a64a6 commit f4840cf
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions caddyconfig/caddyfile/importgraph.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ import (
type adjacency map[string][]string

type importGraph struct {
nodes map[string]bool
nodes map[string]struct{}
edges adjacency
}

func (i *importGraph) addNode(name string) {
if i.nodes == nil {
i.nodes = make(map[string]bool)
i.nodes = make(map[string]struct{})
}
if _, exists := i.nodes[name]; exists {
return
}
i.nodes[name] = true
i.nodes[name] = struct{}{}
}

func (i *importGraph) addNodes(names []string) {
Expand Down Expand Up @@ -66,7 +66,7 @@ func (i *importGraph) addEdge(from, to string) error {
}

if i.nodes == nil {
i.nodes = make(map[string]bool)
i.nodes = make(map[string]struct{})
}
if i.edges == nil {
i.edges = make(adjacency)
Expand Down
2 changes: 1 addition & 1 deletion caddyconfig/caddyfile/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func Parse(filename string, input []byte) ([]ServerBlock, error) {
p := parser{
Dispenser: NewDispenser(tokens),
importGraph: importGraph{
nodes: make(map[string]bool),
nodes: make(map[string]struct{}),
edges: make(adjacency),
},
}
Expand Down

0 comments on commit f4840cf

Please sign in to comment.