- renaming of suite to suit

Author: Hydoc

card.go

@@ -1,4 +1,4 @@
-//go:generate stringer -type=Suite,Rank
+//go:generate stringer -type=Suit,Rank
 
 package deck
 
@@ -37,8 +37,8 @@ type Card struct {
 	Rank Rank
 }
 
-func (c Card) Is(rank Rank, suite Suit) bool {
-	return c.Rank == rank && c.Suit == suite
+func (c Card) Is(rank Rank, suit Suit) bool {
+	return c.Rank == rank && c.Suit == suit
 }
 
 func (c Card) String() string {

card_test.go

@@ -4,47 +4,47 @@ import "testing"
 
 func TestCard_Is(t *testing.T) {
 	tests := []struct {
-		name  string
-		card  Card
-		rank  Rank
-		suite Suit
-		want  bool
+		name string
+		card Card
+		rank Rank
+		suit Suit
+		want bool
 	}{
 		{
 			name: "is requested card",
 			card: Card{
 				Suit: Spade,
 				Rank: Two,
 			},
-			rank:  Two,
-			suite: Spade,
-			want:  true,
+			rank: Two,
+			suit: Spade,
+			want: true,
 		},
 		{
-			name: "suite does not match",
+			name: "suit does not match",
 			card: Card{
 				Suit: Spade,
 				Rank: Two,
 			},
-			rank:  Two,
-			suite: Heart,
-			want:  false,
+			rank: Two,
+			suit: Heart,
+			want: false,
 		},
 		{
 			name: "rank does not match",
 			card: Card{
 				Suit: Heart,
 				Rank: Ace,
 			},
-			rank:  Two,
-			suite: Heart,
-			want:  false,
+			rank: Two,
+			suit: Heart,
+			want: false,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := tt.card.Is(tt.rank, tt.suite)
+			got := tt.card.Is(tt.rank, tt.suit)
 			if tt.want != got {
 				t.Errorf("want %v, got %v", tt.want, got)
 			}

deck.go

@@ -2,7 +2,7 @@ package deck
 
 import "math/rand/v2"
 
-var Suites = []Suit{Spade, Diamond, Club, Heart}
+var Suits = []Suit{Spade, Diamond, Club, Heart}
 var Ranks = []Rank{Ace, Two, Three, Four, Five, Six, Seven, Eight, Nine, Ten, Jack, Queen, King}
 
 func Draw(cards []Card) (Card, []Card) {
@@ -20,7 +20,7 @@ func Shuffle(cards []Card) []Card {
 func New(opts ...func([]Card) []Card) []Card {
 	var cards []Card
 
-	for _, s := range Suites {
+	for _, s := range Suits {
 		for _, r := range Ranks {
 			cards = append(cards, Card{Suit: s, Rank: r})
 		}

deck_test.go

@@ -38,20 +38,20 @@ func Test_NewDeck(t *testing.T) {
 
 func TestDeck_Draw(t *testing.T) {
 	tests := []struct {
-		name      string
-		wantSize  int
-		setup     func(cards []Card) (Card, []Card)
-		wantSuite Suit
-		wantRank  Rank
+		name     string
+		wantSize int
+		setup    func(cards []Card) (Card, []Card)
+		wantSuit Suit
+		wantRank Rank
 	}{
 		{
 			name:     "draw a card",
 			wantSize: 51,
 			setup: func(cards []Card) (Card, []Card) {
 				return Draw(cards)
 			},
-			wantSuite: Heart,
-			wantRank:  King,
+			wantSuit: Heart,
+			wantRank: King,
 		},
 		{
 			name:     "draw two cards",
@@ -60,8 +60,8 @@ func TestDeck_Draw(t *testing.T) {
 				_, r := Draw(cards)
 				return Draw(r)
 			},
-			wantSuite: Heart,
-			wantRank:  Queen,
+			wantSuit: Heart,
+			wantRank: Queen,
 		},
 	}
 
@@ -74,8 +74,8 @@ func TestDeck_Draw(t *testing.T) {
 				t.Errorf("want size %d, got %d", tt.wantSize, len(remaining))
 			}
 
-			if tt.wantSuite != card.Suit {
-				t.Errorf("want suite %d, got %d", tt.wantSuite, card.Suit)
+			if tt.wantSuit != card.Suit {
+				t.Errorf("want suit %d, got %d", tt.wantSuit, card.Suit)
 			}
 
 			if tt.wantRank != card.Rank {