From 04e667a6b15bb83f16f03a0dd3c4b8612ba5c8b7 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 23 Mar 2015 15:18:40 -0700
Subject: [PATCH] Test fixes and rebase conflicts, round 1

---
 src/librustc_back/rpath.rs | 2 +-
 src/libstd/env.rs          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/librustc_back/rpath.rs b/src/librustc_back/rpath.rs
index 68d21abb50ef..10d17e266edf 100644
--- a/src/librustc_back/rpath.rs
+++ b/src/librustc_back/rpath.rs
@@ -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() {
-            Some(PathBuf::new(path))
+            Some(PathBuf::from(path))
         } else {
             None
         }
diff --git a/src/libstd/env.rs b/src/libstd/env.rs
index 9d6933ce9c89..00ce6917835f 100644
--- a/src/libstd/env.rs
+++ b/src/libstd/env.rs
@@ -23,7 +23,7 @@ use error::Error;
 use ffi::{OsString, AsOsStr};
 use fmt;
 use io;
-use path::{self, Path, PathBuf};
+use path::{Path, PathBuf};
 use sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT, Ordering};
 use sync::{StaticMutex, MUTEX_INIT};
 use sys::os as os_imp;