Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
d953a5ce
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d953a5ce
编写于
4月 29, 2013
作者:
D
Daniel Micay
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
replace old_iter::repeat with the Times trait
上级
e91daaa8
变更
13
显示空白变更内容
内联
并排
Showing
13 changed file
with
28 addition
and
54 deletion
+28
-54
doc/tutorial.md
doc/tutorial.md
+1
-1
src/libcore/old_iter.rs
src/libcore/old_iter.rs
+0
-20
src/libcore/task/mod.rs
src/libcore/task/mod.rs
+9
-10
src/librustdoc/markdown_pass.rs
src/librustdoc/markdown_pass.rs
+2
-2
src/libstd/base64.rs
src/libstd/base64.rs
+1
-5
src/libstd/timer.rs
src/libstd/timer.rs
+6
-7
src/libstd/uv_global_loop.rs
src/libstd/uv_global_loop.rs
+2
-2
src/libstd/uv_iotask.rs
src/libstd/uv_iotask.rs
+2
-2
src/test/bench/task-perf-alloc-unwind.rs
src/test/bench/task-perf-alloc-unwind.rs
+1
-1
src/test/run-fail/extern-fail.rs
src/test/run-fail/extern-fail.rs
+1
-1
src/test/run-pass/bitv-perf-test.rs
src/test/run-pass/bitv-perf-test.rs
+1
-1
src/test/run-pass/extern-stress.rs
src/test/run-pass/extern-stress.rs
+1
-1
src/test/run-pass/extern-yield.rs
src/test/run-pass/extern-yield.rs
+1
-1
未找到文件。
doc/tutorial.md
浏览文件 @
d953a5ce
...
...
@@ -1977,7 +1977,7 @@ struct TimeBomb {
impl Drop for TimeBomb {
fn finalize(&self) {
for
old_iter::repeat(self.explosivity)
{
for
self.explosivity.times
{
println("blam!");
}
}
...
...
src/libcore/old_iter.rs
浏览文件 @
d953a5ce
...
...
@@ -238,26 +238,6 @@ pub fn position<A,IA:BaseIter<A>>(this: &IA, f: &fn(&A) -> bool)
// iter interface, such as would provide "reach" in addition to "each". As is,
// it would have to be implemented with foldr, which is too inefficient.
#[inline(always)]
#[cfg(stage0)]
pub
fn
repeat
(
times
:
uint
,
blk
:
&
fn
()
->
bool
)
{
let
mut
i
=
0
;
while
i
<
times
{
if
!
blk
()
{
break
}
i
+=
1
;
}
}
#[inline(always)]
#[cfg(not(stage0))]
pub
fn
repeat
(
times
:
uint
,
blk
:
&
fn
()
->
bool
)
->
bool
{
let
mut
i
=
0
;
while
i
<
times
{
if
!
blk
()
{
return
false
;
}
i
+=
1
;
}
return
true
;
}
#[inline(always)]
pub
fn
min
<
A
:
Copy
+
Ord
,
IA
:
BaseIter
<
A
>>
(
this
:
&
IA
)
->
A
{
match
do
foldl
::
<
A
,
Option
<
A
>
,
IA
>
(
this
,
None
)
|
a
,
b
|
{
...
...
src/libcore/task/mod.rs
浏览文件 @
d953a5ce
...
...
@@ -619,7 +619,7 @@ fn test_spawn_unlinked_unsup_no_fail_down() { // grandchild sends on a port
let
ch
=
ch
.clone
();
do
spawn_unlinked
{
// Give middle task a chance to fail-but-not-kill-us.
for
old_iter
::
repeat
(
16
)
{
task
::
yield
();
}
for
16
.times
{
task
::
yield
();
}
ch
.send
(());
// If killed first, grandparent hangs.
}
fail
!
();
// Shouldn't kill either (grand)parent or (grand)child.
...
...
@@ -634,7 +634,7 @@ fn test_spawn_unlinked_unsup_no_fail_up() { // child unlinked fails
fn
test_spawn_unlinked_sup_no_fail_up
()
{
// child unlinked fails
do
spawn_supervised
{
fail
!
();
}
// Give child a chance to fail-but-not-kill-us.
for
old_iter
::
repeat
(
16
)
{
task
::
yield
();
}
for
16
.times
{
task
::
yield
();
}
}
#[test]
#[should_fail]
#[ignore(cfg(windows))]
fn
test_spawn_unlinked_sup_fail_down
()
{
...
...
@@ -709,7 +709,7 @@ fn test_spawn_failure_propagate_grandchild() {
loop
{
task
::
yield
();
}
}
}
for
old_iter
::
repeat
(
16
)
{
task
::
yield
();
}
for
16
.times
{
task
::
yield
();
}
fail
!
();
}
...
...
@@ -721,7 +721,7 @@ fn test_spawn_failure_propagate_secondborn() {
loop
{
task
::
yield
();
}
}
}
for
old_iter
::
repeat
(
16
)
{
task
::
yield
();
}
for
16
.times
{
task
::
yield
();
}
fail
!
();
}
...
...
@@ -733,7 +733,7 @@ fn test_spawn_failure_propagate_nephew_or_niece() {
loop
{
task
::
yield
();
}
}
}
for
old_iter
::
repeat
(
16
)
{
task
::
yield
();
}
for
16
.times
{
task
::
yield
();
}
fail
!
();
}
...
...
@@ -745,7 +745,7 @@ fn test_spawn_linked_sup_propagate_sibling() {
loop
{
task
::
yield
();
}
}
}
for
old_iter
::
repeat
(
16
)
{
task
::
yield
();
}
for
16
.times
{
task
::
yield
();
}
fail
!
();
}
...
...
@@ -904,8 +904,7 @@ fn test_spawn_sched_blocking() {
// Testing that a task in one scheduler can block in foreign code
// without affecting other schedulers
for
old_iter
::
repeat
(
20u
)
{
for
20u
.times
{
let
(
start_po
,
start_ch
)
=
stream
();
let
(
fin_po
,
fin_ch
)
=
stream
();
...
...
@@ -1024,7 +1023,7 @@ fn test_unkillable() {
// We want to do this after failing
do
spawn_unlinked
{
for
old_iter
::
repeat
(
10
)
{
yield
()
}
for
10
.times
{
yield
()
}
ch
.send
(());
}
...
...
@@ -1059,7 +1058,7 @@ fn test_unkillable_nested() {
// We want to do this after failing
do
spawn_unlinked
||
{
for
old_iter
::
repeat
(
10
)
{
yield
()
}
for
10
.times
{
yield
()
}
ch
.send
(());
}
...
...
src/librustdoc/markdown_pass.rs
浏览文件 @
d953a5ce
...
...
@@ -629,7 +629,7 @@ fn should_request_new_writer_for_each_page() {
let
doc
=
(
page_pass
::
mk_pass
(
config
::
DocPerMod
)
.f
)(
srv
,
doc
);
write_markdown
(
doc
,
writer_factory
);
// We expect two pages to have been written
for
old_iter
::
repeat
(
2
)
{
for
2
.times
{
po
.recv
();
}
}
...
...
@@ -641,7 +641,7 @@ fn should_write_title_for_each_page() {
~
"#[link(name =
\"
core
\"
)]; mod a { }"
);
let
doc
=
(
page_pass
::
mk_pass
(
config
::
DocPerMod
)
.f
)(
srv
,
doc
);
write_markdown
(
doc
,
writer_factory
);
for
old_iter
::
repeat
(
2
)
{
for
2
.times
{
let
(
page
,
markdown
)
=
po
.recv
();
match
page
{
doc
::
CratePage
(
_
)
=>
{
...
...
src/libstd/base64.rs
浏览文件 @
d953a5ce
...
...
@@ -10,10 +10,6 @@
//! Base64 binary-to-text encoding
use
core
::
old_iter
;
use
core
::
str
;
use
core
::
vec
;
pub
trait
ToBase64
{
fn
to_base64
(
&
self
)
->
~
str
;
}
...
...
@@ -152,7 +148,7 @@ fn from_base64(&self) -> ~[u8] {
while
i
<
len
{
let
mut
n
=
0u
;
for
old_iter
::
repeat
(
4u
)
{
for
4u
.times
{
let
ch
=
self
[
i
]
as
char
;
n
<<=
6u
;
...
...
src/libstd/timer.rs
浏览文件 @
d953a5ce
...
...
@@ -188,7 +188,7 @@ fn test_gl_timer_simple_sleep_test() {
#[test]
fn
test_gl_timer_sleep_stress1
()
{
let
hl_loop
=
&
uv
::
global_loop
::
get
();
for
old_iter
::
repeat
(
50u
)
{
for
50u
.times
{
sleep
(
hl_loop
,
1u
);
}
}
...
...
@@ -208,8 +208,7 @@ fn test_gl_timer_sleep_stress2() {
};
for
old_iter
::
repeat
(
repeat
)
{
for
repeat
.times
{
let
ch
=
ch
.clone
();
for
spec
.each
|
spec
|
{
let
(
times
,
maxms
)
=
*
spec
;
...
...
@@ -218,7 +217,7 @@ fn test_gl_timer_sleep_stress2() {
do
task
::
spawn
{
use
core
::
rand
::
*
;
let
mut
rng
=
rng
();
for
old_iter
::
repeat
(
times
)
{
for
times
.times
{
sleep
(
&
hl_loop_clone
,
rng
.next
()
as
uint
%
maxms
);
}
ch
.send
(());
...
...
@@ -226,7 +225,7 @@ fn test_gl_timer_sleep_stress2() {
}
}
for
old_iter
::
repeat
(
repeat
*
spec
.len
())
{
for
(
repeat
*
spec
.len
())
.times
{
po
.recv
()
}
}
...
...
@@ -244,7 +243,7 @@ fn test_gl_timer_recv_timeout_before_time_passes() {
let
mut
failures
=
0
;
let
hl_loop
=
uv
::
global_loop
::
get
();
for
old_iter
::
repeat
(
times
as
uint
)
{
for
(
times
as
uint
)
.times
{
task
::
yield
();
let
expected
=
rand
::
rng
()
.gen_str
(
16u
);
...
...
@@ -273,7 +272,7 @@ fn test_gl_timer_recv_timeout_after_time_passes() {
let
mut
failures
=
0
;
let
hl_loop
=
uv
::
global_loop
::
get
();
for
old_iter
::
repeat
(
times
as
uint
)
{
for
(
times
as
uint
)
.times
{
let
mut
rng
=
rand
::
rng
();
let
expected
=
Cell
(
rng
.gen_str
(
16u
));
let
(
test_po
,
test_ch
)
=
stream
::
<~
str
>
();
...
...
src/libstd/uv_global_loop.rs
浏览文件 @
d953a5ce
...
...
@@ -215,7 +215,7 @@ fn test_stress_gl_uv_global_loop_high_level_global_timer() {
let
(
exit_po
,
exit_ch
)
=
stream
::
<
()
>
();
let
exit_ch
=
SharedChan
::
new
(
exit_ch
);
let
cycles
=
5000u
;
for
old_iter
::
repeat
(
cycles
)
{
for
cycles
.times
{
let
exit_ch_clone
=
exit_ch
.clone
();
task
::
spawn_sched
(
task
::
ManualThreads
(
1u
),
||
{
let
hl_loop
=
&
get_gl
();
...
...
@@ -223,7 +223,7 @@ fn test_stress_gl_uv_global_loop_high_level_global_timer() {
exit_ch_clone
.send
(());
});
};
for
old_iter
::
repeat
(
cycles
)
{
for
cycles
.times
{
exit_po
.recv
();
};
debug!
(
~
"test_stress_gl_uv_global_loop_high_level_global_timer"
+
...
...
src/libstd/uv_iotask.rs
浏览文件 @
d953a5ce
...
...
@@ -284,7 +284,7 @@ fn test_uv_iotask_async() {
// impl_uv_hl_async() runs have been called, at least.
let
(
work_exit_po
,
work_exit_ch
)
=
stream
::
<
()
>
();
let
work_exit_ch
=
SharedChan
::
new
(
work_exit_ch
);
for
old_iter
::
repeat
(
7u
)
{
for
7u
.times
{
let
iotask_clone
=
iotask
.clone
();
let
work_exit_ch_clone
=
work_exit_ch
.clone
();
do
task
::
spawn_sched
(
task
::
ManualThreads
(
1u
))
{
...
...
@@ -294,7 +294,7 @@ fn test_uv_iotask_async() {
work_exit_ch_clone
.send
(());
};
};
for
old_iter
::
repeat
(
7u
)
{
for
7u
.times
{
debug!
(
"waiting"
);
work_exit_po
.recv
();
};
...
...
src/test/bench/task-perf-alloc-unwind.rs
浏览文件 @
d953a5ce
...
...
@@ -30,7 +30,7 @@ fn main() {
}
fn
run
(
repeat
:
int
,
depth
:
int
)
{
for
old_iter
::
repeat
(
repeat
as
uint
)
{
for
(
repeat
as
uint
)
.times
{
debug!
(
"starting %.4f"
,
precise_time_s
());
do
task
::
try
{
recurse_or_fail
(
depth
,
None
)
...
...
src/test/run-fail/extern-fail.rs
浏览文件 @
d953a5ce
...
...
@@ -37,7 +37,7 @@ fn count(n: uint) -> uint {
}
fn
main
()
{
for
old_iter
::
repeat
(
10u
)
{
for
10u
.times
{
do
task
::
spawn
{
let
result
=
count
(
5u
);
debug!
(
"result = %?"
,
result
);
...
...
src/test/run-pass/bitv-perf-test.rs
浏览文件 @
d953a5ce
...
...
@@ -21,5 +21,5 @@ fn bitv_test() -> bool {
}
pub
fn
main
()
{
do
old_iter
::
repeat
(
10000
)
||
{
bitv_test
()};
do
10000
.times
||
{
bitv_test
()};
}
src/test/run-pass/extern-stress.rs
浏览文件 @
d953a5ce
...
...
@@ -34,7 +34,7 @@ fn count(n: uint) -> uint {
}
pub
fn
main
()
{
for
old_iter
::
repeat
(
100u
)
{
for
100u
.times
{
do
task
::
spawn
{
assert
!
(
count
(
5u
)
==
16u
);
};
...
...
src/test/run-pass/extern-yield.rs
浏览文件 @
d953a5ce
...
...
@@ -31,7 +31,7 @@ fn count(n: uint) -> uint {
}
pub
fn
main
()
{
for
old_iter
::
repeat
(
10u
)
{
for
10u
.times
{
do
task
::
spawn
{
let
result
=
count
(
5u
);
debug!
(
"result = %?"
,
result
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录