MightyPork/elefren-fork
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Fix panic if there are < page number of results

Browse Source
This commit is contained in:
Paul Woolcock
2019-03-06 06:27:52 -05:00
parent dd72034849
commit 5e69ad4b33
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/entities/itemsiter.rs
+4 -1
View File
@@ -53,6 +53,9 @@ impl<'a, T: Clone + for<'de> Deserialize<'de>, H: HttpSend> ItemsIter<'a, T, H>
return None; return None;
}; };
if let Some(items) = items { if let Some(items) = items {
if items.is_empty() {
return None;
}
self.buffer = items; self.buffer = items;
self.cur_idx = 0; self.cur_idx = 0;
Some(()) Some(())
@@ -67,7 +70,7 @@ impl<'a, T: Clone + for<'de> Deserialize<'de>, H: HttpSend> Iterator for ItemsIt
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
if self.use_initial { if self.use_initial {
if self.page.initial_items.is_empty() { if self.page.initial_items.is_empty() || self.cur_idx == self.page.initial_items.len() {
return None; return None;
} }
let idx = self.cur_idx; let idx = self.cur_idx;