diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 14:09:28 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-27 16:09:54 -0700 |
| commit | 7e3fd148b3d9579d341398eb70356eaa8c2e4b56 (patch) | |
| tree | c19ea5b3fea53000f1788c6dde400afd34a5f2ed /src/libstd | |
| parent | 990202cd0e14421a49734bb463aa323e79066062 (diff) | |
| download | rust-7e3fd148b3d9579d341398eb70356eaa8c2e4b56.tar.gz rust-7e3fd148b3d9579d341398eb70356eaa8c2e4b56.zip | |
Test fixes and rebase conflicts, round 3
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ascii.rs | 2 | ||||
| -rw-r--r-- | src/libstd/dynamic_lib.rs | 2 |
2 files changed, 3 insertions, 1 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; |