Skip to content

Commit 093c034

Browse files
committed
---
yaml --- r: 32895 b: refs/heads/dist-snap c: 3254bee h: refs/heads/master i: 32893: aead54a 32891: 93d5751 32887: b6299ab 32879: 6670fff 32863: 2ca40c3 32831: 67d5bcb 32767: 8d500fe v: v3
1 parent 97476cd commit 093c034

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: 51152ccf9dd5830c323ec4e9047c277d1b9292d1
10+
refs/heads/dist-snap: 3254bee55e38c756818bca6a8d65ff8fad641e9a
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libcore/os.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub fn fill_charp_buf(f: fn(*mut c_char, size_t) -> bool)
6868
mod win32 {
6969
use libc::DWORD;
7070

71-
fn fill_utf16_buf_and_decode(f: fn(*mut u16, DWORD) -> DWORD)
71+
pub fn fill_utf16_buf_and_decode(f: fn(*mut u16, DWORD) -> DWORD)
7272
-> Option<~str> {
7373
let mut n = tmpbuf_sz as DWORD;
7474
let mut res = None;
@@ -93,7 +93,7 @@ mod win32 {
9393
return res;
9494
}
9595

96-
fn as_utf16_p<T>(s: &str, f: fn(*u16) -> T) -> T {
96+
pub fn as_utf16_p<T>(s: &str, f: fn(*u16) -> T) -> T {
9797
let mut t = str::to_utf16(s);
9898
// Null terminate before passing on.
9999
t += ~[0u16];
@@ -557,7 +557,7 @@ pub fn make_dir(p: &Path, mode: c_int) -> bool {
557557
// FIXME: turn mode into something useful? #2623
558558
do as_utf16_p(p.to_str()) |buf| {
559559
libc::CreateDirectoryW(buf, unsafe {
560-
unsafe::reinterpret_cast(&0)
560+
cast::reinterpret_cast(&0)
561561
})
562562
!= (0 as BOOL)
563563
}

0 commit comments

Comments
 (0)