diff options
| author | bors <bors@rust-lang.org> | 2017-01-21 00:56:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-21 00:56:18 +0000 |
| commit | aedb49cbc9977fee56bb51a20980b380aca53659 (patch) | |
| tree | 65cdd472388b112d1bb3aba847f596ac13067755 /src/libstd | |
| parent | a52da95ced667fe8ff490f73c0b041a4f926c041 (diff) | |
| parent | 8bee3983f8d480ee928c40f5d92394da0adba9c2 (diff) | |
| download | rust-aedb49cbc9977fee56bb51a20980b380aca53659.tar.gz rust-aedb49cbc9977fee56bb51a20980b380aca53659.zip | |
Auto merge of #39199 - alexcrichton:rollup, r=alexcrichton
Rollup of 28 pull requests - Successful merges: #38603, #38761, #38842, #38847, #38955, #38966, #39062, #39068, #39077, #39111, #39112, #39114, #39118, #39120, #39132, #39135, #39138, #39142, #39143, #39146, #39157, #39166, #39167, #39168, #39179, #39184, #39195, #39197 - Failed merges: #39060, #39145
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net/test.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num.rs | 1 | ||||
| -rw-r--r-- | src/libstd/thread/mod.rs | 9 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/libstd/net/test.rs b/src/libstd/net/test.rs index 3f2eacda7d6..aec3d901ece 100644 --- a/src/libstd/net/test.rs +++ b/src/libstd/net/test.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#[allow(dead_code)] // not used on emscripten +#![allow(warnings)] // not used on emscripten use env; use net::{SocketAddr, SocketAddrV4, SocketAddrV6, Ipv4Addr, Ipv6Addr, ToSocketAddrs}; diff --git a/src/libstd/num.rs b/src/libstd/num.rs index d1c2fc3d3fc..5f83d077a13 100644 --- a/src/libstd/num.rs +++ b/src/libstd/num.rs @@ -172,6 +172,7 @@ mod tests { macro_rules! test_checked_next_power_of_two { ($test_name:ident, $T:ident) => ( + #[cfg_attr(target_os = "emscripten", ignore)] // FIXME(#39119) fn $test_name() { #![test] assert_eq!((0 as $T).checked_next_power_of_two(), Some(1)); diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index a2039db0e40..07a9b4bed99 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -491,9 +491,12 @@ pub fn panicking() -> bool { /// Puts the current thread to sleep for the specified amount of time. /// /// The thread may sleep longer than the duration specified due to scheduling -/// specifics or platform-dependent functionality. Note that on unix platforms -/// this function will not return early due to a signal being received or a -/// spurious wakeup. +/// specifics or platform-dependent functionality. +/// +/// # Platform behavior +/// +/// On Unix platforms this function will not return early due to a +/// signal being received or a spurious wakeup. /// /// # Examples /// |