Rename View::find -> View::find_any

And add the `Finder` trait on Views to provide a true `find`.

src/lib.rs

@@ -100,6 +100,7 @@ pub use with::With;
 pub use printer::Printer;
 
 use backend::{Backend, NcursesBackend};
+use view::Finder;
 
 use std::sync::mpsc;
 use std::any::Any;
@@ -320,11 +321,6 @@ impl Cursive {
         self.active_screen = screen_id;
     }
 
-    fn find_any(&mut self, selector: &view::Selector) -> Option<&mut Any> {
-        // Internal find method that returns a Any object.
-        self.screen_mut().find(selector)
-    }
-
     /// Tries to find the view pointed to by the given path.
     ///
     /// If the view is not found, or if it is not of the asked type,
@@ -348,7 +344,7 @@ impl Cursive {
     /// # }
     /// ```
     pub fn find<V: View + Any>(&mut self, sel: &view::Selector) -> Option<&mut V> {
-        self.find_any(sel).and_then(|b| b.downcast_mut::<V>())
+        self.screen_mut().find(sel)
     }
 
     /// Convenient method to use `find` with a `view::Selector::Id`.

src/view/mod.rs

@@ -118,7 +118,7 @@ pub trait View {
     /// Returns None if the path doesn't lead to a view.
     ///
     /// Default implementation always return `None`.
-    fn find(&mut self, &Selector) -> Option<&mut Any> {
+    fn find_any(&mut self, &Selector) -> Option<&mut Any> {
         None
     }
 
@@ -134,6 +134,19 @@ pub trait View {
     }
 }
 
+/// Provides `find<V: View>` to views.
+pub trait Finder {
+
+    /// Find a view
+    fn find<V: View + Any>(&mut self, sel: &Selector) -> Option<&mut V>;
+}
+
+impl <T: View> Finder for T {
+    fn find<V: View + Any>(&mut self, sel: &Selector) -> Option<&mut V> {
+        self.find_any(sel).and_then(|b| b.downcast_mut::<V>())
+    }
+}
+
 /// Selects a single view (if any) in the tree.
 pub enum Selector<'a> {
     /// Selects a view from its ID.

src/view/view_wrapper.rs

@@ -51,8 +51,8 @@ pub trait ViewWrapper {
     }
 
     /// Wraps the `find` method.
-    fn wrap_find(&mut self, selector: &Selector) -> Option<&mut Any> {
+    fn wrap_find_any(&mut self, selector: &Selector) -> Option<&mut Any> {
-        self.get_view_mut().find(selector)
+        self.get_view_mut().find_any(selector)
     }
 
     /// Wraps the `needs_relayout` method.
@@ -82,8 +82,8 @@ impl<T: ViewWrapper> View for T {
         self.wrap_take_focus(source)
     }
 
-    fn find(&mut self, selector: &Selector) -> Option<&mut Any> {
+    fn find_any(&mut self, selector: &Selector) -> Option<&mut Any> {
-        self.wrap_find(selector)
+        self.wrap_find_any(selector)
     }
 
     fn needs_relayout(&self) -> bool {

src/views/dialog.rs

@@ -396,7 +396,7 @@ impl View for Dialog {
         }
     }
 
-    fn find(&mut self, selector: &Selector) -> Option<&mut Any> {
+    fn find_any(&mut self, selector: &Selector) -> Option<&mut Any> {
-        self.content.find(selector)
+        self.content.find_any(selector)
     }
 }

src/views/id_view.rs

@@ -21,10 +21,10 @@ impl<T: View> IdView<T> {
 impl<T: View + Any> ViewWrapper for IdView<T> {
     wrap_impl!(self.view: T);
 
-    fn wrap_find(&mut self, selector: &Selector) -> Option<&mut Any> {
+    fn wrap_find_any(&mut self, selector: &Selector) -> Option<&mut Any> {
         match selector {
             &Selector::Id(id) if id == self.id => Some(&mut self.view),
-            s => self.view.find(s),
+            s => self.view.find_any(s),
         }
     }
 }

src/views/linear_layout.rs

@@ -383,7 +383,10 @@ impl View for LinearLayout {
         }
     }
 
-    fn find(&mut self, selector: &Selector) -> Option<&mut Any> {
+    fn find_any(&mut self, selector: &Selector) -> Option<&mut Any> {
-        self.children.iter_mut().filter_map(|c| c.view.find(selector)).next()
+        self.children
+            .iter_mut()
+            .filter_map(|c| c.view.find_any(selector))
+            .next()
     }
 }

src/views/list_view.rs

@@ -28,16 +28,6 @@ impl Child {
             _ => None,
         }
     }
-
-    // Currently unused
-    //
-    // fn is_delimiter(&self) -> bool {
-    // match *self {
-    // Child::Row(_, _) => false,
-    // Child::Delimiter => true,
-    // }
-    // }
-    //
 }
 
 /// Displays a scrollable list of elements.
@@ -270,11 +260,11 @@ impl View for ListView {
         true
     }
 
-    fn find(&mut self, selector: &Selector) -> Option<&mut Any> {
+    fn find_any(&mut self, selector: &Selector) -> Option<&mut Any> {
         self.children
             .iter_mut()
             .filter_map(Child::view)
-            .filter_map(|v| v.find(selector))
+            .filter_map(|v| v.find_any(selector))
             .next()
     }
 }

src/views/stack_view.rs

@@ -133,12 +133,10 @@ impl View for StackView {
         }
     }
 
-    fn find(&mut self, selector: &Selector) -> Option<&mut Any> {
+    fn find_any(&mut self, selector: &Selector) -> Option<&mut Any> {
-        for layer in &mut self.layers {
+        self.layers
-            if let Some(any) = layer.view.find(selector) {
+            .iter_mut()
-                return Some(any);
+            .filter_map(|l| l.view.find_any(selector))
-            }
+            .next()
-        }
-        None
     }
 }