Test fixes and rebase conflicts, round 3

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index cb406275455666090a657ceb67ae5959c790873e..20ad71a4bf8c854ef1144a9ba91356d131d12c60 100644 (file)
--- 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 185a9b3ec71f1d96d372e42165461e9d8ac78f4e..b96fe94dd2ed736d0f530701f52460dcdb23b620 100644 (file)
--- 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 275375215641d616a025cd43336712fafc640447..b93bdbaa16f2abe5414dadb0bc2399b5acf2d5b9 100644 (file)
--- 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 aad410c4abf259b6d9643e2b018b7f6b3a0d7420..f1afa2bb9077255b49b1d14c763ded69db660e51 100644 (file)
--- 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())
     }
 }