From 60541cdc1ec334b278740fd6d59b9d08929e6d0d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 26 Nov 2014 10:21:45 -0800
Subject: Test fixes and rebase conflicts

---
 src/libcoretest/slice.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libcoretest')

diff --git a/src/libcoretest/slice.rs b/src/libcoretest/slice.rs
index 29253c50ed0..987da903211 100644
--- a/src/libcoretest/slice.rs
+++ b/src/libcoretest/slice.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::slice::{Found, NotFound};
+use std::slice::BinarySearchResult::{Found, NotFound};
 
 #[test]
 fn binary_search_not_found() {
-- 
cgit 1.4.1-3-g733a5