Merge IdView and RefCellView

And remove `with_id_mut`

examples/refcell_view.rs

@@ -10,9 +10,9 @@ fn main() {
     // Create a dialog with 2 edit fields, and a text view.
     // The text view indicates when the 2 fields content match.
     siv.add_layer(Dialog::around(LinearLayout::vertical()
-            .child(EditView::new().on_edit(on_edit).with_id_mut("1"))
-            .child(EditView::new().on_edit(on_edit).with_id_mut("2"))
-            .child(TextView::new("match").with_id_mut("match"))
+            .child(EditView::new().on_edit(on_edit).with_id("1"))
+            .child(EditView::new().on_edit(on_edit).with_id("2"))
+            .child(TextView::new("match").with_id("match"))
             .fixed_width(10))
         .button("Quit", Cursive::quit));
 

src/lib.rs

@@ -430,16 +430,16 @@ impl Cursive {
         self.find(&view::Selector::Id(id), callback)
     }
 
-    /// Convenient method to find a view wrapped in [`RefCellView`].
+    /// Convenient method to find a view wrapped in [`IdView`].
     ///
-    /// This looks for a `RefCellView<V>` with the given ID, and return
+    /// This looks for a `IdView<V>` with the given ID, and return
     /// a mutable reference to the wrapped view.
     ///
-    /// [`RefCellView`]: views/struct.RefCellView.html
+    /// [`IdView`]: views/struct.IdView.html
     pub fn find_id<V>(&mut self, id: &str) -> Option<views::ViewRef<V>>
         where V: View + Any
     {
-        self.call_on_id(id, views::RefCellView::<V>::get_mut)
+        self.call_on_id(id, views::IdView::<V>::get_mut)
     }
 
     /// Moves the focus to the view identified by `id`.

src/view/identifiable.rs

@@ -1,5 +1,5 @@
 use view::View;
-use views::{IdView, RefCellView};
+use views::IdView;
 
 /// Makes a view wrappable in an [`IdView`].
 ///
@@ -8,19 +8,9 @@ pub trait Identifiable: View + Sized {
     /// Wraps this view into an `IdView` with the given id.
     ///
     /// This is just a shortcut for `IdView::new(id, self)`
-    fn with_id(self, id: &str) -> IdView<Self> {
+    fn with_id<S: Into<String>>(self, id: S) -> IdView<Self> {
         IdView::new(id, self)
     }
-
-    /// Wraps this view into both a [`RefCellView`] and an `IdView`.
-    ///
-    /// This allows to call [`Cursive::find_id_mut`].
-    ///
-    /// [`RefCellView`]: ../views/struct.RefCellView.html
-    /// [`Cursive::find_id_mut`]: ../struct.Cursive.html#method.find_id_mut
-    fn with_id_mut(self, id: &str) -> IdView<RefCellView<Self>> {
-        RefCellView::new(self).with_id(id)
-    }
 }
 
 /// Any `View` implements this trait.

src/view/mod.rs

@@ -66,7 +66,7 @@ use Printer;
 use direction::Direction;
 use event::{Event, EventResult};
 use vec::Vec2;
-use views::RefCellView;
+use views::IdView;
 
 use std::any::Any;
 
@@ -185,8 +185,8 @@ impl<T: View> Finder for T {
                 callback.take() {
                 if v.is::<V>() {
                     *result_ref = v.downcast_mut::<V>().map(|v| callback(v));
-                } else if v.is::<RefCellView<V>>() {
-                    *result_ref = v.downcast_mut::<RefCellView<V>>()
+                } else if v.is::<IdView<V>>() {
+                    *result_ref = v.downcast_mut::<IdView<V>>()
                         .and_then(|v| v.with_view_mut(callback));
                 }
             };

src/views/id_view.rs

@@ -1,38 +1,74 @@
-use std::any::Any;
+use owning_ref::{RcRef, OwningHandle};
 
+use std::cell::{RefCell, RefMut};
+use std::any::Any;
+use std::rc::Rc;
 use view::{Selector, View, ViewWrapper};
 
-/// Wrapper view that allows to select its content with a fixed string id.
-pub struct IdView<T: View> {
-    view: T,
+/// Wrapper around a view to provide interior mutability.
+pub struct IdView<V: View> {
+    view: Rc<RefCell<V>>,
     id: String,
 }
 
-impl<T: View> IdView<T> {
-    /// Wraps the given view. It will be selectable with the given id.
-    pub fn new(id: &str, view: T) -> Self {
+/// Mutable reference to a view.
+pub type ViewRef<V> = OwningHandle<RcRef<RefCell<V>>, RefMut<'static, V>>;
+
+impl<V: View> IdView<V> {
+    /// Wraps `view` in a new `IdView`.
+    pub fn new<S: Into<String>>(id: S, view: V) -> Self {
         IdView {
-            view: view,
-            id: id.to_string(),
-        }
+            view: Rc::new(RefCell::new(view)),
+            id: id.into(),
         }
     }
 
-impl<T: View + Any> ViewWrapper for IdView<T> {
-    wrap_impl!(self.view: T);
+    /// Gets mutable access to the inner view.
+    pub fn get_mut(&mut self) -> ViewRef<V> {
+        // TODO: return a standalone item (not tied to our lifetime)
+        // that bundles `self.view.clone()` and allow mutable reference to
+        // the inner view.
+        let cell_ref = RcRef::new(self.view.clone());
+
+        OwningHandle::new(cell_ref,
+                          |x| unsafe { x.as_ref() }.unwrap().borrow_mut())
+    }
+}
+
+impl<T: View + 'static> ViewWrapper for IdView<T> {
+    type V = T;
+
+    fn with_view<F, R>(&self, f: F) -> Option<R>
+        where F: FnOnce(&Self::V) -> R
+    {
+        self.view
+            .try_borrow()
+            .ok()
+            .map(|v| f(&*v))
+    }
+
+    fn with_view_mut<F, R>(&mut self, f: F) -> Option<R>
+        where F: FnOnce(&mut Self::V) -> R
+    {
+        self.view
+            .try_borrow_mut()
+            .ok()
+            .map(|mut v| f(&mut *v))
+    }
 
     fn wrap_find_any<'a>(&mut self, selector: &Selector,
-                         mut callback: Box<FnMut(&mut Any) + 'a>) {
-        match selector {
-            &Selector::Id(id) if id == self.id => callback(&mut self.view),
-            s => self.view.find_any(s, callback),
-        }
+                         mut callback: Box<for<'b> FnMut(&'b mut Any) + 'a>) {
+        let result = match selector {
+            &Selector::Id(id) if id == self.id => callback(self),
+            s => self.view.borrow_mut().find_any(s, callback),
+        };
+        result
     }
 
     fn wrap_focus_view(&mut self, selector: &Selector) -> Result<(), ()> {
         match selector {
             &Selector::Id(id) if id == self.id => Ok(()),
-            s => self.view.focus_view(s),
+            s => self.view.borrow_mut().focus_view(s),
         }
     }
 }

src/views/mod.rs

@@ -52,7 +52,6 @@ mod menu_popup;
 mod panel;
 mod progress_bar;
 mod radio;
-mod refcell_view;
 mod select_view;
 mod slider_view;
 mod shadow_view;
@@ -69,7 +68,7 @@ pub use self::checkbox::Checkbox;
 pub use self::dialog::Dialog;
 pub use self::dummy::DummyView;
 pub use self::edit_view::EditView;
-pub use self::id_view::IdView;
+pub use self::id_view::{IdView, ViewRef};
 pub use self::key_event_view::KeyEventView;
 pub use self::layer::Layer;
 pub use self::linear_layout::LinearLayout;
@@ -79,7 +78,6 @@ pub use self::menubar::Menubar;
 pub use self::panel::Panel;
 pub use self::progress_bar::{Counter, ProgressBar};
 pub use self::radio::{RadioGroup, RadioButton};
-pub use self::refcell_view::{RefCellView, ViewRef};
 pub use self::select_view::SelectView;
 pub use self::shadow_view::ShadowView;
 pub use self::sized_view::SizedView;

src/views/refcell_view.rs

@@ -1,49 +0,0 @@
-
-
-use owning_ref::{RcRef, OwningHandle};
-
-use std::cell::{RefCell, RefMut};
-use std::rc::Rc;
-use view::{View, ViewWrapper};
-
-/// Wrapper around a view to provide interior mutability.
-pub struct RefCellView<V: View> {
-    view: Rc<RefCell<V>>,
-}
-
-/// Mutable reference to a view.
-pub type ViewRef<V> = OwningHandle<RcRef<RefCell<V>>, RefMut<'static, V>>;
-
-impl<V: View> RefCellView<V> {
-    /// Wraps `view` in a new `RefCellView`.
-    pub fn new(view: V) -> Self {
-        RefCellView { view: Rc::new(RefCell::new(view)) }
-    }
-
-    /// Gets mutable access to the inner view.
-    pub fn get_mut(&mut self) -> ViewRef<V> {
-        // TODO: return a standalone item (not tied to our lifetime)
-        // that bundles `self.view.clone()` and allow mutable reference to
-        // the inner view.
-        let cell_ref = RcRef::new(self.view.clone());
-
-        OwningHandle::new(cell_ref,
-                          |x| unsafe { x.as_ref() }.unwrap().borrow_mut())
-    }
-}
-
-impl<T: View> ViewWrapper for RefCellView<T> {
-    type V = T;
-
-    fn with_view<F, R>(&self, f: F) -> Option<R>
-        where F: FnOnce(&Self::V) -> R
-    {
-        self.view.try_borrow().ok().map(|v| f(&*v))
-    }
-
-    fn with_view_mut<F, R>(&mut self, f: F) -> Option<R>
-        where F: FnOnce(&mut Self::V) -> R
-    {
-        self.view.try_borrow_mut().ok().map(|mut v| f(&mut *v))
-    }
-}