Skip to content

Commit dd9b2aa

Browse files
committed
---
yaml --- r: 194150 b: refs/heads/beta c: 04e667a h: refs/heads/master v: v3
1 parent ebdfff7 commit dd9b2aa

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 7d07f70ccbc5050fcd862b46551775726d1e9561
34+
refs/heads/beta: 04e667a6b15bb83f16f03a0dd3c4b8612ba5c8b7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/src/librustc_back/rpath.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fn path_relative_from(path: &Path, base: &Path) -> Option<PathBuf> {
115115

116116
if path.is_absolute() != base.is_absolute() {
117117
if path.is_absolute() {
118-
Some(PathBuf::new(path))
118+
Some(PathBuf::from(path))
119119
} else {
120120
None
121121
}

branches/beta/src/libstd/env.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use error::Error;
2323
use ffi::{OsString, AsOsStr};
2424
use fmt;
2525
use io;
26-
use path::{self, Path, PathBuf};
26+
use path::{Path, PathBuf};
2727
use sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT, Ordering};
2828
use sync::{StaticMutex, MUTEX_INIT};
2929
use sys::os as os_imp;

0 commit comments

Comments
 (0)