about summary refs log tree commit diff
path: root/src/libstd/sys/windows
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-12-30 16:29:27 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-12-31 08:33:13 -0800
commit582cba183f18eea5c40b6c035d63ad449a9e8604 (patch)
treedabbfd1652be6819c02207ad60b8ed83f05496fd /src/libstd/sys/windows
parent67d13883f868e6b27aa00a6c69f7c748d16e1c94 (diff)
downloadrust-582cba183f18eea5c40b6c035d63ad449a9e8604.tar.gz
rust-582cba183f18eea5c40b6c035d63ad449a9e8604.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/sys/windows')
-rw-r--r--src/libstd/sys/windows/os.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs
index 235ebf211ac..28eca9163f6 100644
--- a/src/libstd/sys/windows/os.rs
+++ b/src/libstd/sys/windows/os.rs
@@ -129,7 +129,7 @@ pub fn fill_utf16_buf_and_decode(f: |*mut u16, DWORD| -> DWORD) -> Option<String
         let mut res = None;
         let mut done = false;
         while !done {
-            let mut buf: Vec<u16> = repeat(0u16).take(n).collect();
+            let mut buf: Vec<u16> = repeat(0u16).take(n as uint).collect();
             let k = f(buf.as_mut_ptr(), n);
             if k == (0 as DWORD) {
                 done = true;