---

yaml
---
r: 57342
b: refs/heads/incoming
c: 22f65e9
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 786ae0114b514f048d94dbbddf24fc56e5b9239c
+refs/heads/incoming: 22f65e9852e71645ab6552106225857bced327a2
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/debuginfo.rs

@@ -368,7 +368,7 @@ fn create_basic_type(cx: @CrateContext, t: ty::t, span: span)
         ty::ty_uint(uint_ty) => match uint_ty {
             ast::ty_u => (~"uint", DW_ATE_unsigned),
             ast::ty_u8 => (~"u8", DW_ATE_unsigned),
-            ast::ty_u16 => (~"i16", DW_ATE_unsigned),
+            ast::ty_u16 => (~"u16", DW_ATE_unsigned),
             ast::ty_u32 => (~"u32", DW_ATE_unsigned),
             ast::ty_u64 => (~"u64", DW_ATE_unsigned)
         },