notohh/rustlings
notohh/rustlings
1
0
Fork 0
mirror of https://github.com/notohh/rustlings.git synced 2024-12-21 16:08:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2062 from jimbo5922/jimbo5922-fix-hashmap3-struct-name

Browse source 
update struct name in hashmap3
This commit is contained in:
Mo 2024-08-08 00:40:51 +02:00 committed by GitHub
commit 09c3ac02f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
exercises/11_hashmaps/hashmaps3.rs
View file

@ -10,12 +10,12 @@ use std::collections::HashMap;
// A structure to store the goal details of a team. // A structure to store the goal details of a team.
#[derive(Default)] #[derive(Default)]
struct Team { struct TeamScores {
goals_scored: u8, goals_scored: u8,
goals_conceded: u8, goals_conceded: u8,
} }
fn build_scores_table(results: &str) -> HashMap<&str, Team> { fn build_scores_table(results: &str) -> HashMap<&str, TeamScores> {
// The name of the team is the key and its associated struct is the value. // The name of the team is the key and its associated struct is the value.
let mut scores = HashMap::new(); let mut scores = HashMap::new();

12
solutions/11_hashmaps/hashmaps3.rs
View file

@ -10,12 +10,12 @@ use std::collections::HashMap;
// A structure to store the goal details of a team. // A structure to store the goal details of a team.
#[derive(Default)] #[derive(Default)]
struct Team { struct TeamScores {
goals_scored: u8, goals_scored: u8,
goals_conceded: u8, goals_conceded: u8,
} }
fn build_scores_table(results: &str) -> HashMap<&str, Team> { fn build_scores_table(results: &str) -> HashMap<&str, TeamScores> {
// The name of the team is the key and its associated struct is the value. // The name of the team is the key and its associated struct is the value.
let mut scores = HashMap::new(); let mut scores = HashMap::new();
@ -28,13 +28,17 @@ fn build_scores_table(results: &str) -> HashMap<&str, Team> {
let team_2_score: u8 = split_iterator.next().unwrap().parse().unwrap(); let team_2_score: u8 = split_iterator.next().unwrap().parse().unwrap();
// Insert the default with zeros if a team doesn't exist yet. // Insert the default with zeros if a team doesn't exist yet.
let team_1 = scores.entry(team_1_name).or_insert_with(Team::default); let team_1 = scores
.entry(team_1_name)
.or_insert_with(TeamScores::default);
// Update the values. // Update the values.
team_1.goals_scored += team_1_score; team_1.goals_scored += team_1_score;
team_1.goals_conceded += team_2_score; team_1.goals_conceded += team_2_score;
// Similarely for the second team. // Similarely for the second team.
let team_2 = scores.entry(team_2_name).or_insert_with(Team::default); let team_2 = scores
.entry(team_2_name)
.or_insert_with(TeamScores::default);
team_2.goals_scored += team_2_score; team_2.goals_scored += team_2_score;
team_2.goals_conceded += team_1_score; team_2.goals_conceded += team_1_score;
} }