Skip to content

Commit f438a61

Browse files
committed
---
yaml --- r: 63646 b: refs/heads/snap-stage3 c: d071f51 h: refs/heads/master v: v3
1 parent 73d4551 commit f438a61

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: b530ca103388c99e774868645758785d6ad6b9a9
4+
refs/heads/snap-stage3: d071f51cdc7c3492ae2bc4180ffbf13bcdb31439
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/rt/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ Several modules in `core` are clients of `rt`:
5858
#[deny(unused_imports)];
5959
#[deny(unused_mut)];
6060
#[deny(unused_variable)];
61+
#[deny(unused_unsafe)];
6162

6263
use cell::Cell;
6364
use clone::Clone;
@@ -224,7 +225,7 @@ pub fn run(main: ~fn()) -> int {
224225

225226
let nthreads = match os::getenv("RUST_THREADS") {
226227
Some(nstr) => FromStr::from_str(nstr).get(),
227-
None => unsafe { util::num_cpus() }
228+
None => util::num_cpus()
228229
};
229230

230231
// The shared list of sleeping schedulers. Schedulers wake each other

branches/snap-stage3/src/libstd/rt/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pub fn run_in_mt_newsched_task(f: ~fn()) {
7474
do run_in_bare_thread {
7575
let nthreads = match os::getenv("RUST_TEST_THREADS") {
7676
Some(nstr) => FromStr::from_str(nstr).get(),
77-
None => unsafe {
77+
None => {
7878
// Using more threads than cores in test code
7979
// to force the OS to preempt them frequently.
8080
// Assuming that this help stress test concurrent types.

branches/snap-stage3/src/libstd/rt/uv/timer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ mod test {
160160
let mut timer2 = TimerWatcher::new(&mut loop_);
161161
do timer2.start(10, 0) |timer2, _| {
162162

163-
unsafe { *count_ptr += 1; }
163+
*count_ptr += 1;
164164

165165
timer2.close(||());
166166

167167
// Restart the original timer
168168
let mut timer = timer;
169169
do timer.start(1, 0) |timer, _| {
170-
unsafe { *count_ptr += 1; }
170+
*count_ptr += 1;
171171
timer.close(||());
172172
}
173173
}

0 commit comments

Comments
 (0)