From 7e3fd148b3d9579d341398eb70356eaa8c2e4b56 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 27 Mar 2015 14:09:28 -0700
Subject: [PATCH] Test fixes and rebase conflicts, round 3

---
 src/libstd/ascii.rs                           | 2 ++
 src/libstd/dynamic_lib.rs                     | 2 +-
 src/test/run-make/extern-fn-reachable/main.rs | 2 +-
 src/test/run-pass/issue-23485.rs              | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index cb406275455..20ad71a4bf8 100644
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -124,6 +124,7 @@ pub trait AsciiExt {
     /// # Examples
     ///
     /// ```
+    /// # #![feature(ascii)]
     /// use std::ascii::AsciiExt;
     ///
     /// let mut ascii = 'a';
@@ -142,6 +143,7 @@ pub trait AsciiExt {
     /// # Examples
     ///
     /// ```
+    /// # #![feature(ascii)]
     /// use std::ascii::AsciiExt;
     ///
     /// let mut ascii = 'A';
diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs
index 185a9b3ec71..b96fe94dd2e 100644
--- a/src/libstd/dynamic_lib.rs
+++ b/src/libstd/dynamic_lib.rs
@@ -265,7 +265,7 @@ mod dl {
     use libc;
     use libc::consts::os::extra::ERROR_CALL_NOT_IMPLEMENTED;
     use ops::FnOnce;
-    use os;
+    use sys::os;
     use os::windows::prelude::*;
     use option::Option::{self, Some, None};
     use ptr;
diff --git a/src/test/run-make/extern-fn-reachable/main.rs b/src/test/run-make/extern-fn-reachable/main.rs
index 27537521564..b93bdbaa16f 100644
--- a/src/test/run-make/extern-fn-reachable/main.rs
+++ b/src/test/run-make/extern-fn-reachable/main.rs
@@ -12,7 +12,7 @@
 
 use std::dynamic_lib::DynamicLibrary;
 use std::os;
-use std::old_path::Path;
+use std::path::Path;
 
 pub fn main() {
     unsafe {
diff --git a/src/test/run-pass/issue-23485.rs b/src/test/run-pass/issue-23485.rs
index aad410c4abf..f1afa2bb907 100644
--- a/src/test/run-pass/issue-23485.rs
+++ b/src/test/run-pass/issue-23485.rs
@@ -30,7 +30,7 @@ fn clone_first(mut self) -> Option<<Self::Item as Deref>::Target> where
         Self::Item: Deref,
         <Self::Item as Deref>::Target: Clone,
     {
-        self.next().cloned()
+        self.next().map(|x| x.clone())
     }
 }
 
-- 
GitLab