[librsvg: 18/95] PropertyBagIter: remove an unused field
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 18/95] PropertyBagIter: remove an unused field
- Date: Thu, 22 Feb 2018 03:14:39 +0000 (UTC)
commit ccbe9efe8845f41ca95bbe0638899eb3959381de
Author: Federico Mena Quintero <federico gnome org>
Date: Tue Feb 13 10:05:54 2018 -0600
PropertyBagIter: remove an unused field
rust/src/property_bag.rs | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/rust/src/property_bag.rs b/rust/src/property_bag.rs
index 0f81a41b..53d6a2f0 100644
--- a/rust/src/property_bag.rs
+++ b/rust/src/property_bag.rs
@@ -13,10 +13,7 @@ pub struct PropertyBag<'a>(HashMap<&'a CStr, &'a CStr>);
pub struct OwnedPropertyBag(HashMap<CString, CString>);
-pub struct PropertyBagIter<'a> {
- pbag: &'a PropertyBag<'a>,
- iter: hash_map::Iter<'a, &'a CStr, &'a CStr>
-}
+pub struct PropertyBagIter<'a>(hash_map::Iter<'a, &'a CStr, &'a CStr>);
impl<'a> PropertyBag<'a> {
pub unsafe fn new_from_key_value_pairs(pairs: *const *const libc::c_char) -> PropertyBag<'a> {
@@ -91,10 +88,7 @@ impl<'a> PropertyBag<'a> {
}
pub fn iter(&self) -> PropertyBagIter {
- PropertyBagIter {
- pbag: self,
- iter: self.0.iter()
- }
+ PropertyBagIter(self.0.iter())
}
}
@@ -102,7 +96,7 @@ impl<'a> Iterator for PropertyBagIter<'a> {
type Item = (&'a str, &'a str);
fn next(&mut self) -> Option<Self::Item> {
- self.iter.next().map(|(k, v)| (k.to_str().unwrap(), v.to_str().unwrap()))
+ self.0.next().map(|(k, v)| (k.to_str().unwrap(), v.to_str().unwrap()))
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]