From 56a9e2fcd5f0b737df81a39b22f72a55c95b44a2 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 6 Jan 2015 15:57:50 -0800
Subject: Test fixes and rebase conflicts

---
 src/libstd/path/mod.rs     | 2 +-
 src/libstd/path/windows.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libstd/path')

diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs
index cc418cb510b..581969e98fb 100644
--- a/src/libstd/path/mod.rs
+++ b/src/libstd/path/mod.rs
@@ -68,7 +68,7 @@ use fmt;
 use iter::IteratorExt;
 use option::Option;
 use option::Option::{None, Some};
-use prelude::v1::{FullRange, Index};
+use ops::{FullRange, Index};
 use str;
 use str::StrExt;
 use string::{String, CowString};
diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs
index bd3382b4288..bd4b0407bf5 100644
--- a/src/libstd/path/windows.rs
+++ b/src/libstd/path/windows.rs
@@ -25,7 +25,7 @@ use iter::{AdditiveIterator, Extend};
 use iter::{Iterator, IteratorExt, Map, repeat};
 use mem;
 use option::Option::{self, Some, None};
-use prelude::v1::{FullRange, Index};
+use ops::{FullRange, Index};
 use slice::{SliceExt, SliceConcatExt};
 use str::{SplitTerminator, FromStr, StrExt};
 use string::{String, ToString};
-- 
cgit 1.4.1-3-g733a5