---

huonw · huonw · commit 2da9c7cafd46 · 2014-02-17T23:53:49.000+11:00
yaml --- r: 108426 b: refs/heads/dist-snap c: 35b1b62 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: a96cea4f5a713eb357bde3d395c5453058be88c5
+refs/heads/dist-snap: 35b1b62ddfc31c2e52b65c2f908c0fcbc6465de5
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/libstd/str.rs b/branches/dist-snap/src/libstd/str.rs
@@ -881,7 +881,7 @@ impl<'a> Iterator<UTF16Item> for UTF16Items<'a> {
             }
 
             // all ok, so lets decode it.
-            let c = (u - 0xD800) as u32 << 10 | (u2 - 0xDC00) as u32 | 0x1_0000;
+            let c = ((u - 0xD800) as u32 << 10 | (u2 - 0xDC00) as u32) + 0x1_0000;
             Some(ScalarValue(unsafe {cast::transmute(c)}))
         }
     }
@@ -3824,7 +3824,10 @@ mod tests {
                 0xdc9c_u16, 0xd801_u16, 0xdc92_u16, 0xd801_u16,
                 0xdc96_u16, 0xd801_u16, 0xdc86_u16, 0x0020_u16,
                 0xd801_u16, 0xdc95_u16, 0xd801_u16, 0xdc86_u16,
-                0x000a_u16 ]) ];
+                0x000a_u16 ]),
+             // Issue #12318, even-numbered non-BMP planes
+             (~"\U00020000",
+              ~[0xD840, 0xDC00])];
 
         for p in pairs.iter() {
             let (s, u) = (*p).clone();

Original file line number	Diff line number	Diff line change
`@@ -881,7 +881,7 @@ impl<'a> Iterator<UTF16Item> for UTF16Items<'a> {`
`881`	`881`	`}`
`882`	`882`
`883`	`883`	`// all ok, so lets decode it.`
`884`		`- let c = (u - 0xD800) as u32 << 10 \| (u2 - 0xDC00) as u32 \| 0x1_0000;`
	`884`	`+ let c = ((u - 0xD800) as u32 << 10 \| (u2 - 0xDC00) as u32) + 0x1_0000;`
`885`	`885`	`Some(ScalarValue(unsafe {cast::transmute(c)}))`
`886`	`886`	`}`
`887`	`887`	`}`
`@@ -3824,7 +3824,10 @@ mod tests {`
`3824`	`3824`	`0xdc9c_u16, 0xd801_u16, 0xdc92_u16, 0xd801_u16,`
`3825`	`3825`	`0xdc96_u16, 0xd801_u16, 0xdc86_u16, 0x0020_u16,`
`3826`	`3826`	`0xd801_u16, 0xdc95_u16, 0xd801_u16, 0xdc86_u16,`
`3827`		`- 0x000a_u16 ]) ];`
	`3827`	`+ 0x000a_u16 ]),`
	`3828`	`+ // Issue #12318, even-numbered non-BMP planes`
	`3829`	`+ (~"\U00020000",`
	`3830`	`+ ~[0xD840, 0xDC00])];`
`3828`	`3831`
`3829`	`3832`	`for p in pairs.iter() {`
`3830`	`3833`	`let (s, u) = (*p).clone();`