Skip to content

Commit

Permalink
Test fixes from rollup
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton committed Jun 10, 2014
1 parent 24cbe38 commit 5ede96c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libnative/io/file_win32.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use std::mem;
use std::os::win32::fill_utf16_buf_and_decode;
use std::ptr;
use std::rt::rtio;
use std::rt::rtio::IoResult;
use std::rt::rtio::{IoResult, IoError};
use std::str;
use std::vec;

Expand Down Expand Up @@ -412,7 +412,7 @@ pub fn rename(old: &CString, new: &CString) -> IoResult<()> {
pub fn chmod(p: &CString, mode: uint) -> IoResult<()> {
let p = try!(to_utf16(p));
super::mkerr_libc(unsafe {
libc::wchmod(p.as_ptr(), mode.bits() as libc::c_int)
libc::wchmod(p.as_ptr(), mode as libc::c_int)
})
}

Expand Down

5 comments on commit 5ede96c

@bors
Copy link
Contributor

@bors bors commented on 5ede96c Jun 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at alexcrichton@5ede96c

@bors
Copy link
Contributor

@bors bors commented on 5ede96c Jun 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging alexcrichton/rust/rollup = 5ede96c into auto

@bors
Copy link
Contributor

@bors bors commented on 5ede96c Jun 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alexcrichton/rust/rollup = 5ede96c merged ok, testing candidate = 5bc2d03

@bors
Copy link
Contributor

@bors bors commented on 5ede96c Jun 10, 2014

@bors
Copy link
Contributor

@bors bors commented on 5ede96c Jun 10, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 5bc2d03

Please sign in to comment.