jarjar/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2026-01-11 13:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[INFRASEC-3212] Solving merge conflict

Browse Source
This commit is contained in:
contre95 2023-02-15 22:23:51 +01:00
parent dbcc36182d
commit 6d22e3a2bb
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
exercises/hashmaps/hashmaps2.rs
View File

@ -11,7 +11,6 @@
//
// Execute `rustlings hint hashmaps2` or use the `hint` watch subcommand for a hint.
// I AM NOT DONE
use std::collections::HashMap;

45
exercises/hashmaps/hashmaps3.rs
View File

@ -40,6 +40,51 @@ fn build_scores_table(results: String) -> HashMap<String, Team> {
// will be the number of goals conceded from team_2, and similarly
// goals scored by team_2 will be the number of goals conceded by
// team_1.
let t1: Team = Team {
name: team_1_name.clone(),
goals_scored: team_1_score,
goals_conceded: team_2_score,
};
let t2: Team = Team {
name: team_2_name.clone(),
goals_scored: team_2_score,
goals_conceded: team_1_score,
};
let t1 = scores
.entry(team_1_name)
.and_modify(|ot1| {
ot1.goals_scored += t1.goals_scored;
ot1.goals_conceded += t1.goals_conceded;
})
.or_insert(t1);
let t2 = scores
.entry(team_2_name)
.and_modify(|ot2| {
ot2.goals_scored += t2.goals_scored;
ot2.goals_conceded += t2.goals_conceded;
})
.or_insert(t2);
// match scores.get_mut(&team_1_name){
// Some(ot1) => {
// ot1.goals_scored += t1.goals_scored;
// ot1.goals_conceded += t1.goals_conceded;
// },
// None => {scores.insert(team_1_name, t1);},
// }
//
// match scores.get_mut(&team_2_name){
// Some(ot2) => {
// ot2.goals_scored += t2.goals_scored;
// ot2.goals_conceded += t2.goals_conceded;
// },
// None => {scores.insert(team_2_name, t2);},
// }
//
}
scores
}