Skip to content

refactor: use slices.Equal to simplify code #37367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −19
Open

refactor: use slices.Equal to simplify code #37367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions internal/addrs/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package addrs

import (
"slices"
"strings"

"github.com/hashicorp/hcl/v2"
Expand Down Expand Up @@ -58,15 +59,7 @@ func (m Module) String() string {
}

func (m Module) Equal(other Module) bool {
if len(m) != len(other) {
return false
}
for i := range m {
if m[i] != other[i] {
return false
}
}
return true
return slices.Equal(m, other)
}

type moduleKey string
Expand Down
12 changes: 2 additions & 10 deletions internal/addrs/module_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package addrs

import (
"fmt"
"slices"
"strings"

"github.com/hashicorp/hcl/v2"
Expand Down Expand Up @@ -305,16 +306,7 @@ func (mk moduleInstanceKey) uniqueKeySigil() {}
// Equal returns true if the receiver and the given other value
// contains the exact same parts.
func (m ModuleInstance) Equal(o ModuleInstance) bool {
if len(m) != len(o) {
return false
}

for i := range m {
if m[i] != o[i] {
return false
}
}
return true
return slices.Equal(m, o)
}

// Less returns true if the receiver should sort before the given other value
Expand Down
Loading