diff options
| author | NODA, Kai <nodakai@gmail.com> | 2014-10-05 18:11:17 +0800 |
|---|---|---|
| committer | NODA, Kai <nodakai@gmail.com> | 2014-10-13 14:16:22 +0800 |
| commit | f27ad3d3e99ce679f782607971a9f6f18befa503 (patch) | |
| tree | 388f850cfb1e4d06077dfa6cd28a0e79eda28c07 /src/libsync | |
| parent | a6e0c76ef4b8ed87698dc9fe51e952039d33b913 (diff) | |
| download | rust-f27ad3d3e99ce679f782607971a9f6f18befa503.tar.gz rust-f27ad3d3e99ce679f782607971a9f6f18befa503.zip | |
Clean up rustc warnings.
compiletest: compact "linux" "macos" etc.as "unix".
liballoc: remove a superfluous "use".
libcollections: remove invocations of deprecated methods in favor of
their suggested replacements and use "_" for a loop counter.
libcoretest: remove invocations of deprecated methods; also add
"allow(deprecated)" for testing a deprecated method itself.
libglob: use "cfg_attr".
libgraphviz: add a test for one of data constructors.
libgreen: remove a superfluous "use".
libnum: "allow(type_overflow)" for type cast into u8 in a test code.
librustc: names of static variables should be in upper case.
libserialize: v[i] instead of get().
libstd/ascii: to_lowercase() instead of to_lower().
libstd/bitflags: modify AnotherSetOfFlags to use i8 as its backend.
It will serve better for testing various aspects of bitflags!.
libstd/collections: "allow(deprecated)" for testing a deprecated
method itself.
libstd/io: remove invocations of deprecated methods and superfluous "use".
Also add #[test] where it was missing.
libstd/num: introduce a helper function to effectively remove
invocations of a deprecated method.
libstd/path and rand: remove invocations of deprecated methods and
superfluous "use".
libstd/task and libsync/comm: "allow(deprecated)" for testing
a deprecated method itself.
libsync/deque: remove superfluous "unsafe".
libsync/mutex and once: names of static variables should be in upper case.
libterm: introduce a helper function to effectively remove
invocations of a deprecated method.
We still see a few warnings about using obsoleted native::task::spawn()
in the test modules for libsync. I'm not sure how I should replace them
with std::task::TaksBuilder and native::task::NativeTaskBuilder
(dependency to libstd?)
Signed-off-by: NODA, Kai <nodakai@gmail.com>
Diffstat (limited to 'src/libsync')
| -rw-r--r-- | src/libsync/comm/duplex.rs | 3 | ||||
| -rw-r--r-- | src/libsync/deque.rs | 34 | ||||
| -rw-r--r-- | src/libsync/mutex.rs | 26 | ||||
| -rw-r--r-- | src/libsync/one.rs | 12 |
4 files changed, 36 insertions, 39 deletions
diff --git a/src/libsync/comm/duplex.rs b/src/libsync/comm/duplex.rs index 587827d2bc5..1dc1f4b87f2 100644 --- a/src/libsync/comm/duplex.rs +++ b/src/libsync/comm/duplex.rs @@ -59,10 +59,11 @@ impl<S:Send,R:Send> DuplexStream<S, R> { } } +#[allow(deprecated)] #[cfg(test)] mod test { use std::prelude::*; - use comm::{duplex}; + use comm::duplex; #[test] pub fn duplex_stream_1() { diff --git a/src/libsync/deque.rs b/src/libsync/deque.rs index 33881629329..09fa8920a07 100644 --- a/src/libsync/deque.rs +++ b/src/libsync/deque.rs @@ -553,14 +553,12 @@ mod tests { let threads = range(0, NTHREADS).map(|_| { let s = s.clone(); Thread::start(proc() { - unsafe { - loop { - match s.steal() { - Data(2) => { HITS.fetch_add(1, SeqCst); } - Data(..) => fail!(), - _ if DONE.load(SeqCst) => break, - _ => {} - } + loop { + match s.steal() { + Data(2) => { HITS.fetch_add(1, SeqCst); } + Data(..) => fail!(), + _ if DONE.load(SeqCst) => break, + _ => {} } } }) @@ -572,7 +570,7 @@ mod tests { if rng.gen_range(0i, 3) == 2 { match w.pop() { None => {} - Some(2) => unsafe { HITS.fetch_add(1, SeqCst); }, + Some(2) => { HITS.fetch_add(1, SeqCst); }, Some(_) => fail!(), } } else { @@ -581,22 +579,20 @@ mod tests { } } - unsafe { - while HITS.load(SeqCst) < AMT as uint { - match w.pop() { - None => {} - Some(2) => { HITS.fetch_add(1, SeqCst); }, - Some(_) => fail!(), - } + while HITS.load(SeqCst) < AMT as uint { + match w.pop() { + None => {} + Some(2) => { HITS.fetch_add(1, SeqCst); }, + Some(_) => fail!(), } - DONE.store(true, SeqCst); } + DONE.store(true, SeqCst); for thread in threads.into_iter() { thread.join(); } - assert_eq!(unsafe { HITS.load(SeqCst) }, expected as uint); + assert_eq!(HITS.load(SeqCst), expected as uint); } #[test] @@ -655,7 +651,7 @@ mod tests { } } - unsafe { DONE.store(true, SeqCst); } + DONE.store(true, SeqCst); for thread in threads.into_iter() { thread.join(); diff --git a/src/libsync/mutex.rs b/src/libsync/mutex.rs index 9861d27c8cd..796c62354c3 100644 --- a/src/libsync/mutex.rs +++ b/src/libsync/mutex.rs @@ -536,32 +536,32 @@ mod test { #[test] fn smoke_static() { - static m: StaticMutex = MUTEX_INIT; + static M: StaticMutex = MUTEX_INIT; unsafe { - drop(m.lock()); - drop(m.lock()); - m.destroy(); + drop(M.lock()); + drop(M.lock()); + M.destroy(); } } #[test] fn lots_and_lots() { - static m: StaticMutex = MUTEX_INIT; + static M: StaticMutex = MUTEX_INIT; static mut CNT: uint = 0; - static M: uint = 1000; - static N: uint = 3; + static J: uint = 1000; + static K: uint = 3; fn inc() { - for _ in range(0, M) { + for _ in range(0, J) { unsafe { - let _g = m.lock(); + let _g = M.lock(); CNT += 1; } } } let (tx, rx) = channel(); - for _ in range(0, N) { + for _ in range(0, K) { let tx2 = tx.clone(); native::task::spawn(proc() { inc(); tx2.send(()); }); let tx2 = tx.clone(); @@ -569,12 +569,12 @@ mod test { } drop(tx); - for _ in range(0, 2 * N) { + for _ in range(0, 2 * K) { rx.recv(); } - assert_eq!(unsafe {CNT}, M * N * 2); + assert_eq!(unsafe {CNT}, J * K * 2); unsafe { - m.destroy(); + M.destroy(); } } diff --git a/src/libsync/one.rs b/src/libsync/one.rs index f0c72780be1..62b37660912 100644 --- a/src/libsync/one.rs +++ b/src/libsync/one.rs @@ -126,17 +126,17 @@ mod test { #[test] fn smoke_once() { - static o: Once = ONCE_INIT; + static O: Once = ONCE_INIT; let mut a = 0i; - o.doit(|| a += 1); + O.doit(|| a += 1); assert_eq!(a, 1); - o.doit(|| a += 1); + O.doit(|| a += 1); assert_eq!(a, 1); } #[test] fn stampede_once() { - static o: Once = ONCE_INIT; + static O: Once = ONCE_INIT; static mut run: bool = false; let (tx, rx) = channel(); @@ -145,7 +145,7 @@ mod test { spawn(proc() { for _ in range(0u, 4) { task::deschedule() } unsafe { - o.doit(|| { + O.doit(|| { assert!(!run); run = true; }); @@ -156,7 +156,7 @@ mod test { } unsafe { - o.doit(|| { + O.doit(|| { assert!(!run); run = true; }); |
