about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-06-27 15:07:16 -0700
committerCorey Richardson <corey@octayn.net>2013-06-28 10:47:59 -0400
commit10bcb60e8f8520c11e34758e290a21534425dee6 (patch)
tree6a9d339cde7017df3d00209e2530a345cf08822a /src/libstd
parentf25f466afe7d4d94d711e4f288fd39ab72f1cc61 (diff)
downloadrust-10bcb60e8f8520c11e34758e290a21534425dee6.tar.gz
rust-10bcb60e8f8520c11e34758e290a21534425dee6.zip
librustc: Fix even *MORE* merge fallout!
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/os.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 590292d0d32..400a93ee28f 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -146,7 +146,7 @@ pub mod win32 {
     pub fn as_utf16_p<T>(s: &str, f: &fn(*u16) -> T) -> T {
         let mut t = s.to_utf16();
         // Null terminate before passing on.
-        t += [0u16];
+        t.push(0u16);
         vec::as_imm_buf(t, |buf, _len| f(buf))
     }
 }