Add IntoPair trait to allow returning Inhibit when a pair is needed

Author: antoyo

src/option.rs src/into.rssrc/option.rs renamed to src/into.rs

@@ -19,6 +19,8 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+use gtk::Inhibit;
+
 #[doc(hidden)]
 pub trait IntoOption<T> {
     #[doc(hidden)]
@@ -36,3 +38,21 @@ impl<T> IntoOption<T> for () {
         None
     }
 }
+
+#[doc(hidden)]
+pub trait IntoPair<A, B> {
+    #[doc(hidden)]
+    fn into_pair(self) -> (A, B);
+}
+
+impl<A> IntoPair<Option<A>, Inhibit> for Inhibit {
+    fn into_pair(self) -> (Option<A>, Inhibit) {
+        (None, self)
+    }
+}
+
+impl<A, B> IntoPair<A, B> for (A, B) {
+    fn into_pair(self) -> (A, B) {
+        self
+    }
+}

src/lib.rs

@@ -84,8 +84,8 @@ extern crate relm_core;
 
 mod component;
 mod container;
+mod into;
 mod macros;
-mod option;
 mod stream;
 mod widget;
 
@@ -110,7 +110,7 @@ pub use relm_core::EventStream;
 
 pub use container::{Container, ContainerWidget, RelmContainer};
 pub use component::Component;
-pub use option::IntoOption;
+pub use into::{IntoOption, IntoPair};
 use stream::ToStream;
 pub use widget::Widget;
 

src/macros.rs

@@ -74,7 +74,7 @@ macro_rules! connect {
     ($relm:expr, $widget:expr, $event:ident($($args:pat),*), return $msg:expr) => {{
         let stream = $relm.stream().clone();
         $widget.$event(move |$($args),*| {
-            let (msg, return_value) = $msg;
+            let (msg, return_value) = ::relm::IntoPair::into_pair($msg);
             let msg: Option<_> = ::relm::IntoOption::into_option(msg);
             if let Some(msg) = msg {
                 stream.emit(msg);
@@ -96,7 +96,7 @@ macro_rules! connect {
             let $widget_clone = $widget_clone.upgrade().expect("upgrade should always work");
             check_recursion!($widget_clone);
             let mut $widget_clone = $widget_clone.borrow_mut();
-            let (msg, return_value) = $msg;
+            let (msg, return_value) = ::relm::IntoPair::into_pair($msg);
             let msg: Option<_> = ::relm::IntoOption::into_option(msg);
             if let Some(msg) = msg {
                 stream.emit(msg);