From ab91098fda3a1152b3f0179a2fa902f1b1151a4d Mon Sep 17 00:00:00 2001 From: hippietrail Date: Mon, 22 Jun 2026 18:23:25 +0800 Subject: [PATCH] fix: bring solution in line with exercise --- solutions/11_hashmaps/hashmaps3.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/solutions/11_hashmaps/hashmaps3.rs b/solutions/11_hashmaps/hashmaps3.rs index 485bf830..b3a046ce 100644 --- a/solutions/11_hashmaps/hashmaps3.rs +++ b/solutions/11_hashmaps/hashmaps3.rs @@ -2,7 +2,7 @@ // the form ",,," // Example: "England,France,4,2" (England scored 4 goals, France 2). // -// You have to build a scores table containing the name of the team, the total +// You have to build a table of scores containing the name of the team, the total // number of goals the team scored, and the total number of goals the team // conceded. @@ -15,13 +15,13 @@ struct TeamScores { goals_conceded: u8, } -fn build_scores_table(results: &str) -> HashMap<&str, TeamScores> { +fn build_score_table(results: &str) -> HashMap<&str, TeamScores> { // The name of the team is the key and its associated struct is the value. let mut scores = HashMap::<&str, TeamScores>::new(); for line in results.lines() { let mut split_iterator = line.split(','); - // NOTE: We use `unwrap` because we didn't deal with error handling yet. + // NOTE: We use `unwrap` because we haven't dealt with error handling yet. let team_1_name = split_iterator.next().unwrap(); let team_2_name = split_iterator.next().unwrap(); let team_1_score: u8 = split_iterator.next().unwrap().parse().unwrap(); @@ -58,7 +58,7 @@ England,Spain,1,0"; #[test] fn build_scores() { - let scores = build_scores_table(RESULTS); + let scores = build_score_table(RESULTS); assert!( ["England", "France", "Germany", "Italy", "Poland", "Spain"] @@ -69,7 +69,7 @@ England,Spain,1,0"; #[test] fn validate_team_score_1() { - let scores = build_scores_table(RESULTS); + let scores = build_score_table(RESULTS); let team = scores.get("England").unwrap(); assert_eq!(team.goals_scored, 6); assert_eq!(team.goals_conceded, 4); @@ -77,7 +77,7 @@ England,Spain,1,0"; #[test] fn validate_team_score_2() { - let scores = build_scores_table(RESULTS); + let scores = build_score_table(RESULTS); let team = scores.get("Spain").unwrap(); assert_eq!(team.goals_scored, 0); assert_eq!(team.goals_conceded, 3);