about summary refs log tree commit diff
path: root/src/libcollections/string.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-04-07 00:57:08 +0000
committerbors <bors@rust-lang.org>2015-04-07 00:57:08 +0000
commitb2e65ee6e4e1523b1d4c56ea0ec430e28946f2f4 (patch)
tree5837198731a012961b7903cfa27fae690d4b2a5b /src/libcollections/string.rs
parentb49a5ef003fedcbb0d78aebda62ba30dfdd17a20 (diff)
parentfbba28e246950b06a322947af0152dda5f0444c0 (diff)
downloadrust-b2e65ee6e4e1523b1d4c56ea0ec430e28946f2f4.tar.gz
rust-b2e65ee6e4e1523b1d4c56ea0ec430e28946f2f4.zip
Auto merge of #23952 - Kimundi:more_string_pattern, r=alexcrichton
This adds the missing methods and turns `str::pattern` in a user facing module, as per RFC.

This also contains some big internal refactorings:
- string iterator pairs are implemented with a central macro to reduce redundancy 
- Moved all tests from `coretest::str` into `collectionstest::str` and left a note to prevent the two sets of tests drifting apart further.

See https://github.com/rust-lang/rust/issues/22477
Diffstat (limited to 'src/libcollections/string.rs')
-rw-r--r--src/libcollections/string.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs
index 8da8cad98a7..441d0f2c5df 100644
--- a/src/libcollections/string.rs
+++ b/src/libcollections/string.rs
@@ -24,7 +24,7 @@ use core::mem;
 use core::ops::{self, Deref, Add, Index};
 use core::ptr;
 use core::slice;
-use core::str::Pattern;
+use core::str::pattern::Pattern;
 use unicode::str as unicode_str;
 use unicode::str::Utf16Item;