From dd67e55c10acf80dbd2c14a8eb231e265b5776a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20L=C3=B6bel?= <loebel.marvin@gmail.com>
Date: Tue, 1 Mar 2016 17:53:51 +0100
Subject: [PATCH] Changed `std::pattern::Pattern` impl on `&'a &'a str` to `&'a
 &'b str` in order to allow a bit more felixibility in how to use it.

---
 src/libcollectionstest/str.rs | 13 +++++++++++++
 src/libcore/str/pattern.rs    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/libcollectionstest/str.rs b/src/libcollectionstest/str.rs
index 25457043a9d..b84b37dbf75 100644
--- a/src/libcollectionstest/str.rs
+++ b/src/libcollectionstest/str.rs
@@ -1508,6 +1508,19 @@ generate_iterator_test! {
     with str::rsplitn;
 }
 
+#[test]
+fn different_str_pattern_forwarding_lifetimes() {
+    use std::str::pattern::Pattern;
+
+    fn foo<'a, P>(p: P) where for<'b> &'b P: Pattern<'a> {
+        for _ in 0..3 {
+            "asdf".find(&p);
+        }
+    }
+
+    foo::<&str>("x");
+}
+
 mod bench {
     use test::{Bencher, black_box};
 
diff --git a/src/libcore/str/pattern.rs b/src/libcore/str/pattern.rs
index 29130100e99..abad29cb775 100644
--- a/src/libcore/str/pattern.rs
+++ b/src/libcore/str/pattern.rs
@@ -492,7 +492,7 @@ impl<'a, F> Pattern<'a> for F where F: FnMut(char) -> bool {
 /////////////////////////////////////////////////////////////////////////////
 
 /// Delegates to the `&str` impl.
-impl<'a, 'b> Pattern<'a> for &'b &'b str {
+impl<'a, 'b, 'c> Pattern<'a> for &'c &'b str {
     pattern_methods!(StrSearcher<'a, 'b>, |&s| s, |s| s);
 }