user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test fixes and rebase conflicts, round 2

Browse source
This commit is contained in:
Alex Crichton 2015-03-31 11:41:18 -07:00
parent 554946c81e
commit 30532884f8
15 changed files with 80 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustdoc/flock.rs
View file

@ -195,8 +195,8 @@ mod imp {
impl Lock {
pub fn new(p: &Path) -> Lock {
let p: &OsStr = p.as_ref();
let mut p_16: Vec<_> = p.encode_wide().collect();
let os: &OsStr = p.as_ref();
let mut p_16: Vec<_> = os.encode_wide().collect();
p_16.push(0);
let handle = unsafe {
libc::CreateFileW(p_16.as_ptr(),

1
src/librustdoc/lib.rs
View file

@ -23,7 +23,6 @@
#![feature(box_patterns)]
#![feature(box_syntax)]
#![feature(collections)]
#![feature(core)]
#![feature(exit_status)]
#![feature(set_stdio)]
#![feature(libc)]