about summary refs log tree commit diff
path: root/src/librustc/session
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-02-22 22:45:46 +0000
committerbors <bors@rust-lang.org>2015-02-22 22:45:46 +0000
commit67eb38ee4cfd7b28f8498b5b6492da172768dcb9 (patch)
tree358263816246c0e05a4ba458cadb266307a96172 /src/librustc/session
parentdcc6ce2c772cb851ac35cbc2ddafcae9bf2fa9fd (diff)
parentc8dd2d066d7b25246d2b940b7c161b8b67608b74 (diff)
downloadrust-67eb38ee4cfd7b28f8498b5b6492da172768dcb9.tar.gz
rust-67eb38ee4cfd7b28f8498b5b6492da172768dcb9.zip
Auto merge of #22466 - Kimundi:str_pattern_ai_safe, r=aturon
This is not a complete implementation of the RFC:

- only existing methods got updated, no new ones added
- doc comments are not extensive enough yet
- optimizations got lost and need to be reimplemented

See https://github.com/rust-lang/rfcs/pull/528

Technically a

[breaking-change]
Diffstat (limited to 'src/librustc/session')
-rw-r--r--src/librustc/session/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/session/mod.rs b/src/librustc/session/mod.rs
index 932a96e9b9e..b690cc7f7d0 100644
--- a/src/librustc/session/mod.rs
+++ b/src/librustc/session/mod.rs
@@ -280,9 +280,9 @@ fn split_msg_into_multilines(msg: &str) -> Option<String> {
     }
 
     let mut tail = &msg[head..];
-    let third = tail.find_str("(values differ")
-                   .or(tail.find_str("(lifetime"))
-                   .or(tail.find_str("(cyclic type of infinite size"));
+    let third = tail.find("(values differ")
+                   .or(tail.find("(lifetime"))
+                   .or(tail.find("(cyclic type of infinite size"));
     // Insert `\n` before any remaining messages which match.
     if let Some(pos) = third {
         // The end of the message may just be wrapped in `()` without