about summary refs log tree commit diff
path: root/src/libunicode
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-03-04 22:03:15 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-03-05 12:38:33 +0530
commit145b83e63355c672f8e43129f8e7833fac35dce2 (patch)
tree041ed4dd28872ac22473460cdfc8ca8b7ef260aa /src/libunicode
parentc8c4d85b5014a947f57acd9a1e14b7864689f73d (diff)
parent34410ec748b92e15c445ba7371561e2e5c5aaa55 (diff)
downloadrust-145b83e63355c672f8e43129f8e7833fac35dce2.tar.gz
rust-145b83e63355c672f8e43129f8e7833fac35dce2.zip
Rollup merge of #22994 - eddyb:unsuffix-ints-good, r=alexcrichton
 Automatic has-same-types testing methodology can be found in #22501.
Because most of them don't work with `--pretty=typed`, compile-fail tests were manually audited.

r? @aturon
Diffstat (limited to 'src/libunicode')
-rw-r--r--src/libunicode/u_str.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libunicode/u_str.rs b/src/libunicode/u_str.rs
index 38cbe5c7dea..57439addeaa 100644
--- a/src/libunicode/u_str.rs
+++ b/src/libunicode/u_str.rs
@@ -525,7 +525,7 @@ impl<I> Iterator for Utf16Encoder<I> where I: Iterator<Item=char> {
             return Some(tmp);
         }
 
-        let mut buf = [0u16; 2];
+        let mut buf = [0; 2];
         self.chars.next().map(|ch| {
             let n = CharExt::encode_utf16(ch, &mut buf).unwrap_or(0);
             if n == 2 { self.extra = buf[1]; }