Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
88962eee
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,发现更多精彩内容 >>
提交
88962eee
编写于
12月 11, 2012
作者:
E
Erick Tryzelaar
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
core: Add &self to core::iter methods
上级
3fc74df7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
83 addition
and
70 deletion
+83
-70
src/libcore/int-template.rs
src/libcore/int-template.rs
+3
-3
src/libcore/iter-trait.rs
src/libcore/iter-trait.rs
+29
-22
src/libcore/iter.rs
src/libcore/iter.rs
+20
-19
src/libcore/uint-template.rs
src/libcore/uint-template.rs
+2
-2
src/libcore/vec.rs
src/libcore/vec.rs
+29
-24
未找到文件。
src/libcore/int-template.rs
浏览文件 @
88962eee
...
...
@@ -98,12 +98,12 @@ impl T: iter::Times {
will execute the given function exactly x times. If we assume that
\
`x` is an int, this is functionally equivalent to
\
`for int::range(0, x) |_i| { /* anything */ }`."
]
pure
fn
times
(
it
:
fn
()
->
bool
)
{
if
self
<
0
{
pure
fn
times
(
&
self
,
it
:
fn
()
->
bool
)
{
if
*
self
<
0
{
fail
fmt!
(
"The .times method expects a nonnegative number,
\
but found %?"
,
self
);
}
let
mut
i
=
self
;
let
mut
i
=
*
self
;
while
i
>
0
{
if
!
it
()
{
break
}
i
-=
1
;
...
...
src/libcore/iter-trait.rs
浏览文件 @
88962eee
...
...
@@ -20,46 +20,53 @@
use
self
::
inst
::{
IMPL_T
,
EACH
,
SIZE_HINT
};
impl
<
A
>
IMPL_T
<
A
>
:
iter
::
BaseIter
<
A
>
{
pure
fn
each
(
blk
:
fn
(
v
:
&
A
)
->
bool
)
{
EACH
(
&
self
,
blk
)
}
pure
fn
size_hint
(
)
->
Option
<
uint
>
{
SIZE_HINT
(
&
self
)
}
pure
fn
each
(
&
self
,
blk
:
fn
(
v
:
&
A
)
->
bool
)
{
EACH
(
self
,
blk
)
}
pure
fn
size_hint
(
&
self
)
->
Option
<
uint
>
{
SIZE_HINT
(
self
)
}
}
impl
<
A
>
IMPL_T
<
A
>
:
iter
::
ExtendedIter
<
A
>
{
pure
fn
eachi
(
blk
:
fn
(
uint
,
v
:
&
A
)
->
bool
)
{
iter
::
eachi
(
&
self
,
blk
)
}
pure
fn
all
(
blk
:
fn
(
&
A
)
->
bool
)
->
bool
{
iter
::
all
(
&
self
,
blk
)
}
pure
fn
any
(
blk
:
fn
(
&
A
)
->
bool
)
->
bool
{
iter
::
any
(
&
self
,
blk
)
}
pure
fn
foldl
<
B
>
(
b0
:
B
,
blk
:
fn
(
&
B
,
&
A
)
->
B
)
->
B
{
iter
::
foldl
(
&
self
,
move
b0
,
blk
)
pure
fn
eachi
(
&
self
,
blk
:
fn
(
uint
,
v
:
&
A
)
->
bool
)
{
iter
::
eachi
(
self
,
blk
)
}
pure
fn
position
(
f
:
fn
(
&
A
)
->
bool
)
->
Option
<
uint
>
{
iter
::
position
(
&
self
,
f
)
pure
fn
all
(
&
self
,
blk
:
fn
(
&
A
)
->
bool
)
->
bool
{
iter
::
all
(
self
,
blk
)
}
pure
fn
any
(
&
self
,
blk
:
fn
(
&
A
)
->
bool
)
->
bool
{
iter
::
any
(
self
,
blk
)
}
pure
fn
foldl
<
B
>
(
&
self
,
b0
:
B
,
blk
:
fn
(
&
B
,
&
A
)
->
B
)
->
B
{
iter
::
foldl
(
self
,
move
b0
,
blk
)
}
pure
fn
position
(
&
self
,
f
:
fn
(
&
A
)
->
bool
)
->
Option
<
uint
>
{
iter
::
position
(
self
,
f
)
}
}
impl
<
A
:
Eq
>
IMPL_T
<
A
>
:
iter
::
EqIter
<
A
>
{
pure
fn
contains
(
x
:
&
A
)
->
bool
{
iter
::
contains
(
&
self
,
x
)
}
pure
fn
count
(
x
:
&
A
)
->
uint
{
iter
::
count
(
&
self
,
x
)
}
pure
fn
contains
(
&
self
,
x
:
&
A
)
->
bool
{
iter
::
contains
(
self
,
x
)
}
pure
fn
count
(
&
self
,
x
:
&
A
)
->
uint
{
iter
::
count
(
self
,
x
)
}
}
impl
<
A
:
Copy
>
IMPL_T
<
A
>
:
iter
::
CopyableIter
<
A
>
{
pure
fn
filter_to_vec
(
pred
:
fn
(
a
:
A
)
->
bool
)
->
~
[
A
]
{
iter
::
filter_to_vec
(
&
self
,
pred
)
pure
fn
filter_to_vec
(
&
self
,
pred
:
fn
(
a
:
A
)
->
bool
)
->
~
[
A
]
{
iter
::
filter_to_vec
(
self
,
pred
)
}
pure
fn
map_to_vec
<
B
>
(
op
:
fn
(
v
:
A
)
->
B
)
->
~
[
B
]
{
iter
::
map_to_vec
(
&
self
,
op
)
pure
fn
map_to_vec
<
B
>
(
&
self
,
op
:
fn
(
v
:
A
)
->
B
)
->
~
[
B
]
{
iter
::
map_to_vec
(
self
,
op
)
}
pure
fn
to_vec
(
)
->
~
[
A
]
{
iter
::
to_vec
(
&
self
)
}
pure
fn
to_vec
(
&
self
)
->
~
[
A
]
{
iter
::
to_vec
(
self
)
}
pure
fn
flat_map_to_vec
<
B
:
Copy
,
IB
:
BaseIter
<
B
>>
(
op
:
fn
(
a
:
A
)
->
IB
)
pure
fn
flat_map_to_vec
<
B
:
Copy
,
IB
:
BaseIter
<
B
>>
(
&
self
,
op
:
fn
(
a
:
A
)
->
IB
)
->
~
[
B
]
{
iter
::
flat_map_to_vec
(
&
self
,
op
)
iter
::
flat_map_to_vec
(
self
,
op
)
}
pure
fn
find
(
&
self
,
f
:
fn
(
A
)
->
bool
)
->
Option
<
A
>
{
iter
::
find
(
self
,
f
)
}
pure
fn
find
(
p
:
fn
(
a
:
A
)
->
bool
)
->
Option
<
A
>
{
iter
::
find
(
&
self
,
p
)
}
}
impl
<
A
:
Copy
Ord
>
IMPL_T
<
A
>
:
iter
::
CopyableOrderedIter
<
A
>
{
pure
fn
min
(
)
->
A
{
iter
::
min
(
&
self
)
}
pure
fn
max
(
)
->
A
{
iter
::
max
(
&
self
)
}
pure
fn
min
(
&
self
)
->
A
{
iter
::
min
(
self
)
}
pure
fn
max
(
&
self
)
->
A
{
iter
::
max
(
self
)
}
}
src/libcore/iter.rs
浏览文件 @
88962eee
...
...
@@ -23,38 +23,39 @@
pub
type
InitOp
<
T
>
=
&
fn
(
uint
)
->
T
;
pub
trait
BaseIter
<
A
>
{
pure
fn
each
(
blk
:
fn
(
v
:
&
A
)
->
bool
);
pure
fn
size_hint
()
->
Option
<
uint
>
;
pure
fn
each
(
&
self
,
blk
:
fn
(
v
:
&
A
)
->
bool
);
pure
fn
size_hint
(
&
self
)
->
Option
<
uint
>
;
}
pub
trait
ExtendedIter
<
A
>
{
pure
fn
eachi
(
blk
:
fn
(
uint
,
v
:
&
A
)
->
bool
);
pure
fn
all
(
blk
:
fn
(
&
A
)
->
bool
)
->
bool
;
pure
fn
any
(
blk
:
fn
(
&
A
)
->
bool
)
->
bool
;
pure
fn
foldl
<
B
>
(
b0
:
B
,
blk
:
fn
(
&
B
,
&
A
)
->
B
)
->
B
;
pure
fn
position
(
f
:
fn
(
&
A
)
->
bool
)
->
Option
<
uint
>
;
pure
fn
eachi
(
&
self
,
blk
:
fn
(
uint
,
v
:
&
A
)
->
bool
);
pure
fn
all
(
&
self
,
blk
:
fn
(
&
A
)
->
bool
)
->
bool
;
pure
fn
any
(
&
self
,
blk
:
fn
(
&
A
)
->
bool
)
->
bool
;
pure
fn
foldl
<
B
>
(
&
self
,
b0
:
B
,
blk
:
fn
(
&
B
,
&
A
)
->
B
)
->
B
;
pure
fn
position
(
&
self
,
f
:
fn
(
&
A
)
->
bool
)
->
Option
<
uint
>
;
}
pub
trait
EqIter
<
A
:
Eq
>
{
pure
fn
contains
(
x
:
&
A
)
->
bool
;
pure
fn
count
(
x
:
&
A
)
->
uint
;
pure
fn
contains
(
&
self
,
x
:
&
A
)
->
bool
;
pure
fn
count
(
&
self
,
x
:
&
A
)
->
uint
;
}
pub
trait
Times
{
pure
fn
times
(
it
:
fn
()
->
bool
);
pure
fn
times
(
&
self
,
it
:
fn
()
->
bool
);
}
pub
trait
CopyableIter
<
A
:
Copy
>
{
pure
fn
filter_to_vec
(
pred
:
fn
(
a
:
A
)
->
bool
)
->
~
[
A
];
pure
fn
map_to_vec
<
B
>
(
op
:
fn
(
v
:
A
)
->
B
)
->
~
[
B
];
pure
fn
flat_map_to_vec
<
B
:
Copy
,
IB
:
BaseIter
<
B
>>
(
op
:
fn
(
A
)
->
IB
)
->
~
[
B
];
pure
fn
to_vec
()
->
~
[
A
];
pure
fn
find
(
p
:
fn
(
a
:
A
)
->
bool
)
->
Option
<
A
>
;
pure
fn
filter_to_vec
(
&
self
,
pred
:
fn
(
a
:
A
)
->
bool
)
->
~
[
A
];
pure
fn
map_to_vec
<
B
>
(
&
self
,
op
:
fn
(
v
:
A
)
->
B
)
->
~
[
B
];
pure
fn
flat_map_to_vec
<
B
:
Copy
,
IB
:
BaseIter
<
B
>>
(
&
self
,
op
:
fn
(
A
)
->
IB
)
->
~
[
B
];
pure
fn
to_vec
(
&
self
)
->
~
[
A
];
pure
fn
find
(
&
self
,
p
:
fn
(
A
)
->
bool
)
->
Option
<
A
>
;
}
pub
trait
CopyableOrderedIter
<
A
:
Copy
Ord
>
{
pure
fn
min
()
->
A
;
pure
fn
max
()
->
A
;
pure
fn
min
(
&
self
)
->
A
;
pure
fn
max
(
&
self
)
->
A
;
}
pub
trait
CopyableNonstrictIter
<
A
:
Copy
>
{
...
...
@@ -222,9 +223,9 @@ pub trait Buildable<A> {
}
pub
pure
fn
find
<
A
:
Copy
,
IA
:
BaseIter
<
A
>>
(
self
:
&
IA
,
p
:
fn
(
a
:
A
)
->
bool
)
->
Option
<
A
>
{
f
:
fn
(
A
)
->
bool
)
->
Option
<
A
>
{
for
self
.each
|
i
|
{
if
p
(
*
i
)
{
return
Some
(
*
i
)
}
if
f
(
*
i
)
{
return
Some
(
*
i
)
}
}
return
None
;
}
...
...
src/libcore/uint-template.rs
浏览文件 @
88962eee
...
...
@@ -92,8 +92,8 @@ impl T: iter::Times {
will execute the given function exactly x times. If we assume that
\
`x` is an int, this is functionally equivalent to
\
`for int::range(0, x) |_i| { /* anything */ }`."
]
pure
fn
times
(
it
:
fn
()
->
bool
)
{
let
mut
i
=
self
;
pure
fn
times
(
&
self
,
it
:
fn
()
->
bool
)
{
let
mut
i
=
*
self
;
while
i
>
0
{
if
!
it
()
{
break
}
i
-=
1
;
...
...
src/libcore/vec.rs
浏览文件 @
88962eee
...
...
@@ -2013,57 +2013,62 @@ pub fn memmove(dst: &[mut u8], src: &[const u8], count: uint) {
// required in the slice.
impl
<
A
>
&
[
A
]:
iter
::
BaseIter
<
A
>
{
pub
pure
fn
each
(
blk
:
fn
(
v
:
&
A
)
->
bool
)
{
pub
pure
fn
each
(
&
self
,
blk
:
fn
(
v
:
&
A
)
->
bool
)
{
// FIXME(#2263)---should be able to call each(self, blk)
for
each
(
self
)
|
e
|
{
for
each
(
*
self
)
|
e
|
{
if
(
!
blk
(
e
))
{
return
;
}
}
}
pure
fn
size_hint
(
)
->
Option
<
uint
>
{
Some
(
len
(
self
))
}
pure
fn
size_hint
(
&
self
)
->
Option
<
uint
>
{
Some
(
len
(
*
self
))
}
}
impl
<
A
>
&
[
A
]:
iter
::
ExtendedIter
<
A
>
{
pub
pure
fn
eachi
(
blk
:
fn
(
uint
,
v
:
&
A
)
->
bool
)
{
iter
::
eachi
(
&
self
,
blk
)
pub
pure
fn
eachi
(
&
self
,
blk
:
fn
(
uint
,
v
:
&
A
)
->
bool
)
{
iter
::
eachi
(
self
,
blk
)
}
pub
pure
fn
all
(
blk
:
fn
(
&
A
)
->
bool
)
->
bool
{
iter
::
all
(
&
self
,
blk
)
}
pub
pure
fn
any
(
blk
:
fn
(
&
A
)
->
bool
)
->
bool
{
iter
::
any
(
&
self
,
blk
)
}
pub
pure
fn
foldl
<
B
>
(
b0
:
B
,
blk
:
fn
(
&
B
,
&
A
)
->
B
)
->
B
{
iter
::
foldl
(
&
self
,
b0
,
blk
)
pub
pure
fn
all
(
&
self
,
blk
:
fn
(
&
A
)
->
bool
)
->
bool
{
iter
::
all
(
self
,
blk
)
}
pub
pure
fn
position
(
f
:
fn
(
&
A
)
->
bool
)
->
Option
<
uint
>
{
iter
::
position
(
&
self
,
f
)
pub
pure
fn
any
(
&
self
,
blk
:
fn
(
&
A
)
->
bool
)
->
bool
{
iter
::
any
(
self
,
blk
)
}
pub
pure
fn
foldl
<
B
>
(
&
self
,
b0
:
B
,
blk
:
fn
(
&
B
,
&
A
)
->
B
)
->
B
{
iter
::
foldl
(
self
,
b0
,
blk
)
}
pub
pure
fn
position
(
&
self
,
f
:
fn
(
&
A
)
->
bool
)
->
Option
<
uint
>
{
iter
::
position
(
self
,
f
)
}
}
impl
<
A
:
Eq
>
&
[
A
]:
iter
::
EqIter
<
A
>
{
pub
pure
fn
contains
(
x
:
&
A
)
->
bool
{
iter
::
contains
(
&
self
,
x
)
}
pub
pure
fn
count
(
x
:
&
A
)
->
uint
{
iter
::
count
(
&
self
,
x
)
}
pub
pure
fn
contains
(
&
self
,
x
:
&
A
)
->
bool
{
iter
::
contains
(
self
,
x
)
}
pub
pure
fn
count
(
&
self
,
x
:
&
A
)
->
uint
{
iter
::
count
(
self
,
x
)
}
}
impl
<
A
:
Copy
>
&
[
A
]:
iter
::
CopyableIter
<
A
>
{
pure
fn
filter_to_vec
(
pred
:
fn
(
a
:
A
)
->
bool
)
->
~
[
A
]
{
iter
::
filter_to_vec
(
&
self
,
pred
)
pure
fn
filter_to_vec
(
&
self
,
pred
:
fn
(
a
:
A
)
->
bool
)
->
~
[
A
]
{
iter
::
filter_to_vec
(
self
,
pred
)
}
pure
fn
map_to_vec
<
B
>
(
op
:
fn
(
v
:
A
)
->
B
)
->
~
[
B
]
{
iter
::
map_to_vec
(
&
self
,
op
)
pure
fn
map_to_vec
<
B
>
(
&
self
,
op
:
fn
(
v
:
A
)
->
B
)
->
~
[
B
]
{
iter
::
map_to_vec
(
self
,
op
)
}
pure
fn
to_vec
(
)
->
~
[
A
]
{
iter
::
to_vec
(
&
self
)
}
pure
fn
to_vec
(
&
self
)
->
~
[
A
]
{
iter
::
to_vec
(
self
)
}
pure
fn
flat_map_to_vec
<
B
:
Copy
,
IB
:
BaseIter
<
B
>>
(
op
:
fn
(
A
)
->
IB
)
->
~
[
B
]
{
iter
::
flat_map_to_vec
(
&
self
,
op
)
pure
fn
flat_map_to_vec
<
B
:
Copy
,
IB
:
BaseIter
<
B
>>
(
&
self
,
op
:
fn
(
A
)
->
IB
)
->
~
[
B
]
{
iter
::
flat_map_to_vec
(
self
,
op
)
}
pub
pure
fn
find
(
p
:
fn
(
a
:
A
)
->
bool
)
->
Option
<
A
>
{
iter
::
find
(
&
self
,
p
)
pub
pure
fn
find
(
&
self
,
f
:
fn
(
A
)
->
bool
)
->
Option
<
A
>
{
iter
::
find
(
self
,
f
)
}
}
impl
<
A
:
Copy
Ord
>
&
[
A
]:
iter
::
CopyableOrderedIter
<
A
>
{
pure
fn
min
(
)
->
A
{
iter
::
min
(
&
self
)
}
pure
fn
max
(
)
->
A
{
iter
::
max
(
&
self
)
}
pure
fn
min
(
&
self
)
->
A
{
iter
::
min
(
self
)
}
pure
fn
max
(
&
self
)
->
A
{
iter
::
max
(
self
)
}
}
impl
<
A
:
Copy
>
&
[
A
]
:
iter
::
CopyableNonstrictIter
<
A
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录