From aeb9b2af7b1b9d0a48834c9a3166dbde74d7538f Mon Sep 17 00:00:00 2001
From: Alexandre Bury <alexandre.bury@gmail.com>
Date: Tue, 9 Jun 2020 09:17:07 -0700
Subject: [PATCH] Use fully-qualified paths for wrap_impl! macro

---
 cursive-core/src/view/view_wrapper.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cursive-core/src/view/view_wrapper.rs b/cursive-core/src/view/view_wrapper.rs
index 15c18bd..37dd9d4 100644
--- a/cursive-core/src/view/view_wrapper.rs
+++ b/cursive-core/src/view/view_wrapper.rs
@@ -169,25 +169,25 @@ macro_rules! wrap_impl {
     (self.$v:ident: $t:ty) => {
         type V = $t;
 
-        fn with_view<F, R>(&self, f: F) -> Option<R>
+        fn with_view<F, R>(&self, f: F) -> std::option::Option<R>
         where
-            F: FnOnce(&Self::V) -> R,
+            F: std::ops::FnOnce(&Self::V) -> R,
         {
-            Some(f(&self.$v))
+            std::option::Option::Some(f(&self.$v))
         }
 
-        fn with_view_mut<F, R>(&mut self, f: F) -> Option<R>
+        fn with_view_mut<F, R>(&mut self, f: F) -> std::option::Option<R>
         where
-            F: FnOnce(&mut Self::V) -> R,
+            F: std::ops::FnOnce(&mut Self::V) -> R,
         {
-            Some(f(&mut self.$v))
+            std::option::Option::Some(f(&mut self.$v))
         }
 
-        fn into_inner(self) -> Result<Self::V, Self>
+        fn into_inner(self) -> std::result::Result<Self::V, Self>
         where
             Self::V: Sized,
         {
-            Ok(self.$v)
+            std::result::Result::Ok(self.$v)
         }
     };
 }