diff options
| author | bors <bors@rust-lang.org> | 2015-02-03 03:44:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-03 03:44:05 +0000 |
| commit | 7858cb432d3f2efc0374424cb2b51518f697c172 (patch) | |
| tree | bccd460a861e61f758d2d459cb9da02b1ad8792b /src/libunicode | |
| parent | eaf4c5c784637f3df8bdebc6ec21dbd4bc69420a (diff) | |
| parent | 9ece22ee00033cdf0b6b418c451112c92c8ad922 (diff) | |
| download | rust-7858cb432d3f2efc0374424cb2b51518f697c172.tar.gz rust-7858cb432d3f2efc0374424cb2b51518f697c172.zip | |
Auto merge of #21872 - alexcrichton:rollup, r=alexcrichton
Diffstat (limited to 'src/libunicode')
| -rw-r--r-- | src/libunicode/normalize.rs | 4 | ||||
| -rw-r--r-- | src/libunicode/u_str.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libunicode/normalize.rs b/src/libunicode/normalize.rs index c6f86ccd9d4..e35634ac465 100644 --- a/src/libunicode/normalize.rs +++ b/src/libunicode/normalize.rs @@ -52,7 +52,7 @@ fn d<F>(c: char, i: &mut F, k: bool) where F: FnMut(char) { // First check the canonical decompositions match bsearch_table(c, canonical_table) { Some(canon) => { - for x in canon.iter() { + for x in canon { d(*x, i, k); } return; @@ -66,7 +66,7 @@ fn d<F>(c: char, i: &mut F, k: bool) where F: FnMut(char) { // Then check the compatibility decompositions match bsearch_table(c, compatibility_table) { Some(compat) => { - for x in compat.iter() { + for x in compat { d(*x, i, k); } return; diff --git a/src/libunicode/u_str.rs b/src/libunicode/u_str.rs index 9a757c0c980..0e3aacbc09a 100644 --- a/src/libunicode/u_str.rs +++ b/src/libunicode/u_str.rs @@ -32,7 +32,7 @@ use tables::grapheme::GraphemeCat; /// An iterator over the words of a string, separated by a sequence of whitespace #[stable(feature = "rust1", since = "1.0.0")] pub struct Words<'a> { - inner: Filter<&'a str, Split<'a, fn(char) -> bool>, fn(&&str) -> bool>, + inner: Filter<Split<'a, fn(char) -> bool>, fn(&&str) -> bool>, } /// Methods for Unicode string slices |