Skip to content

Commit 9114941

Browse files
brianchbrianch
committed
No need to use String for the theme's tag name
1 parent b464833 commit 9114941

File tree

1 file changed

+67
-67
lines changed

1 file changed

+67
-67
lines changed

‎src/search_tab.rs‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -55,75 +55,75 @@ impl TaticsThemes {
5555
TaticsThemes::Master, TaticsThemes::MasterVsMaster, TaticsThemes::SuperGM
5656
];
5757

58-
pub fn get_tag_name(&self) -> String {
58+
pub fn get_tag_name(&self) -> &str {
5959
match self {
60-
TaticsThemes::All => String::from("all"),
61-
TaticsThemes::Opening => String::from("opening"),
62-
TaticsThemes::Middlegame => String::from("middlegame"),
63-
TaticsThemes::Endgame => String::from("endgame"),
64-
TaticsThemes::RookEndgame => String::from("rookEndgame"),
65-
TaticsThemes::BishopEndgame => String::from("bishopEndgame"),
66-
TaticsThemes::PawnEndgame => String::from("pawnEndgame"),
67-
TaticsThemes::KnightEndgame => String::from("knightEndgame"),
68-
TaticsThemes::QueenEndgame => String::from("queenEndgame"),
69-
TaticsThemes::QueenRookEndgame => String::from("queenRookEndgame"),
60+
TaticsThemes::All => "all",
61+
TaticsThemes::Opening => "opening",
62+
TaticsThemes::Middlegame => "middlegame",
63+
TaticsThemes::Endgame => "endgame",
64+
TaticsThemes::RookEndgame => "rookEndgame",
65+
TaticsThemes::BishopEndgame => "bishopEndgame",
66+
TaticsThemes::PawnEndgame => "pawnEndgame",
67+
TaticsThemes::KnightEndgame => "knightEndgame",
68+
TaticsThemes::QueenEndgame => "queenEndgame",
69+
TaticsThemes::QueenRookEndgame => "queenRookEndgame",
7070

71-
TaticsThemes::AdvancedPawn => String::from("advancedPawn"),
72-
TaticsThemes::AtackingF2F7 => String::from("attackingF2F7"),
73-
TaticsThemes::CapturingDefender => String::from("capturingDefender"),
74-
TaticsThemes::DiscoveredAttack => String::from("discoveredAttack"),
75-
TaticsThemes::DoubleCheck => String::from("doubleCheck"),
76-
TaticsThemes::ExposedKing => String::from("exposedKing"),
77-
TaticsThemes::Fork => String::from("fork"),
78-
TaticsThemes::HangingPiece => String::from("hangingPiece"),
79-
TaticsThemes::KingsideAttack => String::from("kingsideAttack"),
80-
TaticsThemes::Pin => String::from("pin"),
81-
TaticsThemes::QueensideAttack => String::from("queensideAttack"),
82-
TaticsThemes::Sacrifice => String::from("sacrifice"),
83-
TaticsThemes::Skewer => String::from("skewer"),
84-
TaticsThemes::TrappedPiece => String::from("trappedPiece"),
85-
86-
TaticsThemes::Attraction => String::from("attraction"),
87-
TaticsThemes::Clearance => String::from("clearance"),
88-
TaticsThemes::DefensiveMove => String::from("defensiveMove"),
89-
TaticsThemes::Deflection => String::from("deflection"),
90-
TaticsThemes::Interference => String::from("interference"),
91-
TaticsThemes::Intermezzo => String::from("intermezzo"),
92-
TaticsThemes::QuietMove => String::from("quietMove"),
93-
TaticsThemes::XRayAttack => String::from("xRayAttack"),
94-
TaticsThemes::Zugzwang => String::from("zugzwang"),
71+
TaticsThemes::AdvancedPawn => "advancedPawn",
72+
TaticsThemes::AtackingF2F7 => "attackingF2F7",
73+
TaticsThemes::CapturingDefender => "capturingDefender",
74+
TaticsThemes::DiscoveredAttack => "discoveredAttack",
75+
TaticsThemes::DoubleCheck => "doubleCheck",
76+
TaticsThemes::ExposedKing => "exposedKing",
77+
TaticsThemes::Fork => "fork",
78+
TaticsThemes::HangingPiece => "hangingPiece",
79+
TaticsThemes::KingsideAttack => "kingsideAttack",
80+
TaticsThemes::Pin => "pin",
81+
TaticsThemes::QueensideAttack => "queensideAttack",
82+
TaticsThemes::Sacrifice => "sacrifice",
83+
TaticsThemes::Skewer => "skewer",
84+
TaticsThemes::TrappedPiece => "trappedPiece",
85+
86+
TaticsThemes::Attraction => "attraction",
87+
TaticsThemes::Clearance => "clearance",
88+
TaticsThemes::DefensiveMove => "defensiveMove",
89+
TaticsThemes::Deflection => "deflection",
90+
TaticsThemes::Interference => "interference",
91+
TaticsThemes::Intermezzo => "intermezzo",
92+
TaticsThemes::QuietMove => "quietMove",
93+
TaticsThemes::XRayAttack =>"xRayAttack",
94+
TaticsThemes::Zugzwang => "zugzwang",
9595

96-
TaticsThemes::Mate => String::from("mate"),
97-
TaticsThemes::MateIn1 => String::from("mateIn1"),
98-
TaticsThemes::MateIn2 => String::from("mateIn2"),
99-
TaticsThemes::MateIn3 => String::from("mateIn3"),
100-
TaticsThemes::MateIn4 => String::from("mateIn4"),
101-
TaticsThemes::MateIn5 => String::from("mateIn5"),
102-
TaticsThemes::AnastasiaMate => String::from("anastasiaMate"),
103-
TaticsThemes::ArabianMate => String::from("arabianMate"),
104-
TaticsThemes::BackRankMate => String::from("backRankMate"),
105-
TaticsThemes::BodenMate => String::from("bodenMate"),
106-
TaticsThemes::DoubleBishopMate => String::from("doubleBishopMate"),
107-
TaticsThemes::DovetailMate => String::from("dovetailMate"),
108-
TaticsThemes::HookMate => String::from("hookMate"),
109-
TaticsThemes::SmotheredMate => String::from("smotheredMate"),
110-
111-
TaticsThemes::Castling => String::from("castling"),
112-
TaticsThemes::EnPassant => String::from("enPassant"),
113-
TaticsThemes::Promotion => String::from("promotion"),
114-
TaticsThemes::UnderPromotion => String::from("underPromotion"),
115-
TaticsThemes::Equality => String::from("equality"),
116-
TaticsThemes::Advantage => String::from("advantage"),
117-
TaticsThemes::Crushing => String::from("crushing"),
118-
119-
TaticsThemes::OneMove => String::from("oneMove"),
120-
TaticsThemes::Short => String::from("short"),
121-
TaticsThemes::Long => String::from("long"),
122-
TaticsThemes::VeryLong => String::from("veryLong"),
123-
124-
TaticsThemes::Master => String::from("master"),
125-
TaticsThemes::MasterVsMaster => String::from("masterVsMaster"),
126-
TaticsThemes::SuperGM => String::from("superGM"),
96+
TaticsThemes::Mate => "mate",
97+
TaticsThemes::MateIn1 => "mateIn1",
98+
TaticsThemes::MateIn2 => "mateIn2",
99+
TaticsThemes::MateIn3 => "mateIn3",
100+
TaticsThemes::MateIn4 => "mateIn4",
101+
TaticsThemes::MateIn5 => "mateIn5",
102+
TaticsThemes::AnastasiaMate => "anastasiaMate",
103+
TaticsThemes::ArabianMate => "arabianMate",
104+
TaticsThemes::BackRankMate => "backRankMate",
105+
TaticsThemes::BodenMate => "bodenMate",
106+
TaticsThemes::DoubleBishopMate => "doubleBishopMate",
107+
TaticsThemes::DovetailMate => "dovetailMate",
108+
TaticsThemes::HookMate => "hookMate",
109+
TaticsThemes::SmotheredMate => "smotheredMate",
110+
111+
TaticsThemes::Castling => "castling",
112+
TaticsThemes::EnPassant => "enPassant",
113+
TaticsThemes::Promotion => "promotion",
114+
TaticsThemes::UnderPromotion => "underPromotion",
115+
TaticsThemes::Equality => "equality",
116+
TaticsThemes::Advantage => "advantage",
117+
TaticsThemes::Crushing => "crushing",
118+
119+
TaticsThemes::OneMove => "oneMove",
120+
TaticsThemes::Short => "short",
121+
TaticsThemes::Long => "long",
122+
TaticsThemes::VeryLong => "veryLong",
123+
124+
TaticsThemes::Master => "master",
125+
TaticsThemes::MasterVsMaster => "masterVsMaster",
126+
TaticsThemes::SuperGM => "superGM",
127127
}
128128
}
129129
}
@@ -338,7 +338,7 @@ impl SearchTab {
338338
if let Ok(record) = result {
339339
if record.rating >= min_rating && record.rating <= max_rating &&
340340
(theme == TaticsThemes::All ||
341-
record.themes.contains(&theme.get_tag_name())) {
341+
record.themes.contains(theme.get_tag_name())) {
342342
puzzles.push(record);
343343
}
344344
}

0 commit comments

Comments
 (0)