# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2019-10-12 11:48:30
# Node ID 6f9f15a476a480b9e616bd3bc4c83308928a6c01
# Parent  ed50f2c31a4c773199f3acb449ac1abddf68d030

rust-cpython: remove useless Option<$leaked> from py_shared_iterator

We no longer need to carefully drop the iterator when it's consumed. Mutation
is allowed even if the iterator exists.

There's a minor behavior change: next(iter) may return/raise something other
than StopIteration if it's called after the iterator has been fully consumed,
and if the Rust object isn't a FusedIterator.

diff --git a/rust/hg-cpython/src/ref_sharing.rs b/rust/hg-cpython/src/ref_sharing.rs
--- a/rust/hg-cpython/src/ref_sharing.rs
+++ b/rust/hg-cpython/src/ref_sharing.rs
@@ -570,25 +570,14 @@ macro_rules! py_shared_iterator {
         $success_type: ty
     ) => {
         py_class!(pub class $name |py| {
-            data inner: RefCell<Option<$leaked>>;
+            data inner: RefCell<$leaked>;
 
             def __next__(&self) -> PyResult<$success_type> {
-                let mut inner_opt = self.inner(py).borrow_mut();
-                if let Some(leaked) = inner_opt.as_mut() {
-                    let mut iter = leaked.try_borrow_mut(py)?;
-                    match iter.next() {
-                        None => {
-                            drop(iter);
-                            // replace Some(inner) by None, drop $leaked
-                            inner_opt.take();
-                            Ok(None)
-                        }
-                        Some(res) => {
-                            $success_func(py, res)
-                        }
-                    }
-                } else {
-                    Ok(None)
+                let mut leaked = self.inner(py).borrow_mut();
+                let mut iter = leaked.try_borrow_mut(py)?;
+                match iter.next() {
+                    None => Ok(None),
+                    Some(res) => $success_func(py, res),
                 }
             }
 
@@ -604,7 +593,7 @@ macro_rules! py_shared_iterator {
             ) -> PyResult<Self> {
                 Self::create_instance(
                     py,
-                    RefCell::new(Some(leaked)),
+                    RefCell::new(leaked),
                 )
             }
         }