From 6017b3c6332c4d039b5e7f98b6d8450534748589 Mon Sep 17 00:00:00 2001
From: Micah Johnston <micahrjohnston@gmail.com>
Date: Tue, 8 Oct 2013 12:21:44 -0600
Subject: [PATCH 1/2] Option::and is not as polymorphic as it can be

---
 src/libstd/option.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstd/option.rs b/src/libstd/option.rs
index 5c7ae63d39181..c04e3983731ab 100644
--- a/src/libstd/option.rs
+++ b/src/libstd/option.rs
@@ -132,7 +132,7 @@ impl<T> Option<T> {
 
     /// Returns `None` if the option is `None`, otherwise returns `optb`.
     #[inline]
-    pub fn and(self, optb: Option<T>) -> Option<T> {
+    pub fn and(self, optb: Option<U>) -> Option<U> {
         match self {
             Some(_) => optb,
             None => None,

From c5ee0d8a679a0f249487f5133b78ad22f6eade26 Mon Sep 17 00:00:00 2001
From: Micah Johnston <micahrjohnston@gmail.com>
Date: Tue, 8 Oct 2013 22:22:54 -0600
Subject: [PATCH 2/2] make Option::and fully polymorphic

---
 src/libstd/option.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstd/option.rs b/src/libstd/option.rs
index c04e3983731ab..f9551a7e843b3 100644
--- a/src/libstd/option.rs
+++ b/src/libstd/option.rs
@@ -132,7 +132,7 @@ impl<T> Option<T> {
 
     /// Returns `None` if the option is `None`, otherwise returns `optb`.
     #[inline]
-    pub fn and(self, optb: Option<U>) -> Option<U> {
+    pub fn and<U>(self, optb: Option<U>) -> Option<U> {
         match self {
             Some(_) => optb,
             None => None,