bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Test fixes and rebase conflicts, round 1

Browse source
This commit is contained in:
Alex Crichton 2015-03-23 15:18:40 -07:00
parent 7d07f70ccb
commit 04e667a6b1
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_back/rpath.rs
View file

@ -115,7 +115,7 @@ fn path_relative_from(path: &Path, base: &Path) -> Option<PathBuf> {
if path.is_absolute() != base.is_absolute() { if path.is_absolute() != base.is_absolute() {
if path.is_absolute() { if path.is_absolute() {
Some(PathBuf::new(path)) Some(PathBuf::from(path))
} else { } else {
None None
} }

2
src/libstd/env.rs
View file

@ -23,7 +23,7 @@ use error::Error;
use ffi::{OsString, AsOsStr}; use ffi::{OsString, AsOsStr};
use fmt; use fmt;
use io; use io;
use path::{self, Path, PathBuf}; use path::{Path, PathBuf};
use sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT, Ordering}; use sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT, Ordering};
use sync::{StaticMutex, MUTEX_INIT}; use sync::{StaticMutex, MUTEX_INIT};
use sys::os as os_imp; use sys::os as os_imp;