From 10bcb60e8f8520c11e34758e290a21534425dee6 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 27 Jun 2013 15:07:16 -0700
Subject: librustc: Fix even *MORE* merge fallout!

---
 src/libstd/os.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstd')

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))
     }
 }
-- 
cgit 1.4.1-3-g733a5