about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-11-09 18:14:48 +0000
committerbors <bors@rust-lang.org>2017-11-09 18:14:48 +0000
commitf1ea23e2cc72cafad1dc25a06c09ec2de8e323eb (patch)
tree4bafb2a94c6755051649f9e6cfca17c0312712ab /src/libstd/sync
parent98e791e7e135ef6526ca97c33fcf8cd0db50320f (diff)
parent5c3fe111d4a6e72f0461320f5166bcd6aaf2f37f (diff)
downloadrust-f1ea23e2cc72cafad1dc25a06c09ec2de8e323eb.tar.gz
rust-f1ea23e2cc72cafad1dc25a06c09ec2de8e323eb.zip
Auto merge of #45725 - alexcrichton:std-less-rand, r=dtolnay
Working towards a libc-less (wasm32) libstd

This is a series of commits I was able to extract from prepare to comiple libstd on a "bare libc-less" target, notably wasm32. The actual wasm32 bits I intend to send in a PR later, this is just some internal refactorings required for libstd to work with a `libc` that's empty and a few other assorted refactorings.

No functional change should be included in this PR for users of libstd, this is intended to just be internal refactorings.
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/rwlock.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs
index d59a0b65a69..6216d78528d 100644
--- a/src/libstd/sync/rwlock.rs
+++ b/src/libstd/sync/rwlock.rs
@@ -554,8 +554,6 @@ impl<'a, T: ?Sized> Drop for RwLockWriteGuard<'a, T> {
 
 #[cfg(all(test, not(target_os = "emscripten")))]
 mod tests {
-    #![allow(deprecated)] // rand
-
     use rand::{self, Rng};
     use sync::mpsc::channel;
     use thread;
@@ -576,7 +574,7 @@ mod tests {
 
     #[test]
     fn frob() {
-        const N: usize = 10;
+        const N: u32 = 10;
         const M: usize = 1000;
 
         let r = Arc::new(RwLock::new(()));