Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expect instead of unwrap

Browse Source
This commit is contained in:
Louis Pearson 2021-04-02 20:27:30 -06:00
parent 58274db3e3
commit 3c7898fe8e
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/rtsim/entity.rs
View File

@ -179,7 +179,7 @@ impl Entity {
}); });
self.brain.begin = begin_site_id; self.brain.begin = begin_site_id;
if self.brain.track_computed == false { if !self.brain.track_computed {
begin_site_id begin_site_id
.zip(tgt_site) .zip(tgt_site)
.map(|(begin_site_id, tgt_site)| { .map(|(begin_site_id, tgt_site)| {
@ -202,10 +202,14 @@ impl Entity {
} }
if self.brain.track_computed && self.brain.track.is_some() && tgt_site.is_some() { if self.brain.track_computed && self.brain.track.is_some() && tgt_site.is_some() {
let track_id = self.brain.track.unwrap(); // track checked above let track_id = self
.brain
.track
.expect("Track id is none after is_some check"); // track checked above
let track = &world.civs().tracks.get(track_id); let track = &world.civs().tracks.get(track_id);
let site = &world.civs().sites[tgt_site.unwrap()]; // tgt_site checked above let site =
&world.civs().sites[tgt_site.expect("Target site is none after is_some check")]; // tgt_site checked above
let destination_name = site let destination_name = site
.site_tmp .site_tmp
.map_or("".to_string(), |id| index.sites[id].name().to_string()); .map_or("".to_string(), |id| index.sites[id].name().to_string());
@ -264,7 +268,8 @@ impl Entity {
} }
if !next_pos_calculated && tgt_site.is_some() { if !next_pos_calculated && tgt_site.is_some() {
let site = &world.civs().sites[tgt_site.unwrap()]; let site =
&world.civs().sites[tgt_site.expect("Target site is None after is_some check")];
let destination_name = site let destination_name = site
.site_tmp .site_tmp
.map_or("".to_string(), |id| index.sites[id].name().to_string()); .map_or("".to_string(), |id| index.sites[id].name().to_string());

11
server/src/sys/agent.rs
View File

@ -912,11 +912,12 @@ impl<'a> AgentData<'a> {
.brain .brain
.remembers_character(&tgt_stats.name) .remembers_character(&tgt_stats.name)
{ {
format!( format!(
"Greetings fair {}! It has been far too long since \ "Greetings fair {}! It has been far too \
last I saw you. I'm going to {} right now.", long since last I saw you. I'm going to \
&tgt_stats.name, destination_name {} right now.",
) &tgt_stats.name, destination_name
)
} else { } else {
format!( format!(
"I'm heading to {}! Want to come along?", "I'm heading to {}! Want to come along?",