Test fixes and rebase conflicts, round 3

Author: alexcrichton

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';

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;

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 {

src/test/run-pass/issue-23485.rs

@@ -30,7 +30,7 @@ trait Iterator {
         Self::Item: Deref,
         <Self::Item as Deref>::Target: Clone,
     {
-        self.next().cloned()
+        self.next().map(|x| x.clone())
     }
 }