Musselman/kitchen-freezer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unwraps

Browse source
This commit is contained in:
daladim 2021-03-21 19:24:31 +01:00
parent ddaa32c9f5
commit f29aca941b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/client.rs
View file

@ -98,9 +98,12 @@ impl Client {
async fn sub_request_and_process(&self, url: &Url, body: String, items: &[&str]) -> Result<String, Box<dyn Error>> { async fn sub_request_and_process(&self, url: &Url, body: String, items: &[&str]) -> Result<String, Box<dyn Error>> {
let text = self.sub_request(url, body, 0).await?; let text = self.sub_request(url, body, 0).await?;
let mut current_element: &Element = &text.parse().unwrap(); let mut current_element: &Element = &text.parse()?;
for item in items { for item in items {
current_element = find_elem(&current_element, item).unwrap(); current_element = match find_elem(&current_element, item) {
Some(elem) => elem,
None => return Err(format!("missing element {}", item).into()),
}
} }
Ok(current_element.text()) Ok(current_element.text())
} }
@ -141,7 +144,7 @@ impl Client {
let text = self.sub_request(&cal_home_set, CAL_BODY.into(), 1).await?; let text = self.sub_request(&cal_home_set, CAL_BODY.into(), 1).await?;
let root: Element = text.parse().unwrap(); let root: Element = text.parse()?;
let reps = find_elems(&root, "response"); let reps = find_elems(&root, "response");
let mut calendars = HashMap::new(); let mut calendars = HashMap::new();
for rep in reps { for rep in reps {