Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
2f7a5f49
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,发现更多精彩内容 >>
提交
2f7a5f49
编写于
12月 13, 2014
作者:
J
Jorge Aparicio
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
libcore: make iterator adaptors `Clone`able
上级
444fa1b7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
152 addition
and
0 deletion
+152
-0
src/libcore/iter.rs
src/libcore/iter.rs
+124
-0
src/libcore/slice.rs
src/libcore/slice.rs
+11
-0
src/test/run-pass/issue-12677.rs
src/test/run-pass/issue-12677.rs
+17
-0
未找到文件。
src/libcore/iter.rs
浏览文件 @
2f7a5f49
...
...
@@ -1388,6 +1388,19 @@ pub struct Map<A, B, I: Iterator<A>, F: FnMut(A) -> B> {
f
:
F
,
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
A
,
B
,
I
,
F
>
Clone
for
Map
<
A
,
B
,
I
,
F
>
where
I
:
Clone
+
Iterator
<
A
>
,
F
:
Clone
+
FnMut
(
A
)
->
B
,
{
fn
clone
(
&
self
)
->
Map
<
A
,
B
,
I
,
F
>
{
Map
{
iter
:
self
.iter
.clone
(),
f
:
self
.f
.clone
(),
}
}
}
impl
<
A
,
B
,
I
,
F
>
Map
<
A
,
B
,
I
,
F
>
where
I
:
Iterator
<
A
>
,
F
:
FnMut
(
A
)
->
B
{
#[inline]
fn
do_map
(
&
mut
self
,
elt
:
Option
<
A
>
)
->
Option
<
B
>
{
...
...
@@ -1449,6 +1462,19 @@ pub struct Filter<A, I, P> where I: Iterator<A>, P: FnMut(&A) -> bool {
predicate
:
P
,
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
A
,
I
,
P
>
Clone
for
Filter
<
A
,
I
,
P
>
where
I
:
Clone
+
Iterator
<
A
>
,
P
:
Clone
+
FnMut
(
&
A
)
->
bool
,
{
fn
clone
(
&
self
)
->
Filter
<
A
,
I
,
P
>
{
Filter
{
iter
:
self
.iter
.clone
(),
predicate
:
self
.predicate
.clone
(),
}
}
}
#[unstable
=
"trait is unstable"
]
impl
<
A
,
I
,
P
>
Iterator
<
A
>
for
Filter
<
A
,
I
,
P
>
where
I
:
Iterator
<
A
>
,
P
:
FnMut
(
&
A
)
->
bool
{
#[inline]
...
...
@@ -1494,6 +1520,19 @@ pub struct FilterMap<A, B, I, F> where I: Iterator<A>, F: FnMut(A) -> Option<B>
f
:
F
,
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
A
,
B
,
I
,
F
>
Clone
for
FilterMap
<
A
,
B
,
I
,
F
>
where
I
:
Clone
+
Iterator
<
A
>
,
F
:
Clone
+
FnMut
(
A
)
->
Option
<
B
>
,
{
fn
clone
(
&
self
)
->
FilterMap
<
A
,
B
,
I
,
F
>
{
FilterMap
{
iter
:
self
.iter
.clone
(),
f
:
self
.f
.clone
(),
}
}
}
#[unstable
=
"trait is unstable"
]
impl
<
A
,
B
,
I
,
F
>
Iterator
<
B
>
for
FilterMap
<
A
,
B
,
I
,
F
>
where
I
:
Iterator
<
A
>
,
...
...
@@ -1657,6 +1696,20 @@ pub struct SkipWhile<A, I, P> where I: Iterator<A>, P: FnMut(&A) -> bool {
predicate
:
P
,
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
A
,
I
,
P
>
Clone
for
SkipWhile
<
A
,
I
,
P
>
where
I
:
Clone
+
Iterator
<
A
>
,
P
:
Clone
+
FnMut
(
&
A
)
->
bool
,
{
fn
clone
(
&
self
)
->
SkipWhile
<
A
,
I
,
P
>
{
SkipWhile
{
iter
:
self
.iter
.clone
(),
flag
:
self
.flag
,
predicate
:
self
.predicate
.clone
(),
}
}
}
#[unstable
=
"trait is unstable"
]
impl
<
A
,
I
,
P
>
Iterator
<
A
>
for
SkipWhile
<
A
,
I
,
P
>
where
I
:
Iterator
<
A
>
,
P
:
FnMut
(
&
A
)
->
bool
{
#[inline]
...
...
@@ -1686,6 +1739,20 @@ pub struct TakeWhile<A, I, P> where I: Iterator<A>, P: FnMut(&A) -> bool {
predicate
:
P
,
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
A
,
I
,
P
>
Clone
for
TakeWhile
<
A
,
I
,
P
>
where
I
:
Clone
+
Iterator
<
A
>
,
P
:
Clone
+
FnMut
(
&
A
)
->
bool
,
{
fn
clone
(
&
self
)
->
TakeWhile
<
A
,
I
,
P
>
{
TakeWhile
{
iter
:
self
.iter
.clone
(),
flag
:
self
.flag
,
predicate
:
self
.predicate
.clone
(),
}
}
}
#[unstable
=
"trait is unstable"
]
impl
<
A
,
I
,
P
>
Iterator
<
A
>
for
TakeWhile
<
A
,
I
,
P
>
where
I
:
Iterator
<
A
>
,
P
:
FnMut
(
&
A
)
->
bool
{
#[inline]
...
...
@@ -1847,6 +1914,21 @@ pub struct Scan<A, B, I, St, F> where I: Iterator<A>, F: FnMut(&mut St, A) -> Op
pub
state
:
St
,
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
A
,
B
,
I
,
St
,
F
>
Clone
for
Scan
<
A
,
B
,
I
,
St
,
F
>
where
I
:
Clone
+
Iterator
<
A
>
,
St
:
Clone
,
F
:
Clone
+
FnMut
(
&
mut
St
,
A
)
->
Option
<
B
>
,
{
fn
clone
(
&
self
)
->
Scan
<
A
,
B
,
I
,
St
,
F
>
{
Scan
{
iter
:
self
.iter
.clone
(),
f
:
self
.f
.clone
(),
state
:
self
.state
.clone
(),
}
}
}
#[unstable
=
"trait is unstable"
]
impl
<
A
,
B
,
I
,
St
,
F
>
Iterator
<
B
>
for
Scan
<
A
,
B
,
I
,
St
,
F
>
where
I
:
Iterator
<
A
>
,
...
...
@@ -1876,6 +1958,22 @@ pub struct FlatMap<A, B, I, U, F> where I: Iterator<A>, U: Iterator<B>, F: FnMut
backiter
:
Option
<
U
>
,
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
A
,
B
,
I
,
U
,
F
>
Clone
for
FlatMap
<
A
,
B
,
I
,
U
,
F
>
where
I
:
Clone
+
Iterator
<
A
>
,
U
:
Clone
+
Iterator
<
B
>
,
F
:
Clone
+
FnMut
(
A
)
->
U
,
{
fn
clone
(
&
self
)
->
FlatMap
<
A
,
B
,
I
,
U
,
F
>
{
FlatMap
{
iter
:
self
.iter
.clone
(),
f
:
self
.f
.clone
(),
frontiter
:
self
.frontiter
.clone
(),
backiter
:
self
.backiter
.clone
(),
}
}
}
#[unstable
=
"trait is unstable"
]
impl
<
A
,
B
,
I
,
U
,
F
>
Iterator
<
B
>
for
FlatMap
<
A
,
B
,
I
,
U
,
F
>
where
I
:
Iterator
<
A
>
,
...
...
@@ -2020,6 +2118,19 @@ pub struct Inspect<A, I, F> where I: Iterator<A>, F: FnMut(&A) {
f
:
F
,
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
A
,
I
,
F
>
Clone
for
Inspect
<
A
,
I
,
F
>
where
I
:
Clone
+
Iterator
<
A
>
,
F
:
Clone
+
FnMut
(
&
A
),
{
fn
clone
(
&
self
)
->
Inspect
<
A
,
I
,
F
>
{
Inspect
{
iter
:
self
.iter
.clone
(),
f
:
self
.f
.clone
(),
}
}
}
impl
<
A
,
I
,
F
>
Inspect
<
A
,
I
,
F
>
where
I
:
Iterator
<
A
>
,
F
:
FnMut
(
&
A
)
{
#[inline]
fn
do_inspect
(
&
mut
self
,
elt
:
Option
<
A
>
)
->
Option
<
A
>
{
...
...
@@ -2114,6 +2225,19 @@ pub struct Unfold<A, St, F> where F: FnMut(&mut St) -> Option<A> {
pub
state
:
St
,
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
A
,
St
,
F
>
Clone
for
Unfold
<
A
,
St
,
F
>
where
F
:
Clone
+
FnMut
(
&
mut
St
)
->
Option
<
A
>
,
St
:
Clone
,
{
fn
clone
(
&
self
)
->
Unfold
<
A
,
St
,
F
>
{
Unfold
{
f
:
self
.f
.clone
(),
state
:
self
.state
.clone
(),
}
}
}
#[experimental]
impl
<
A
,
St
,
F
>
Unfold
<
A
,
St
,
F
>
where
F
:
FnMut
(
&
mut
St
)
->
Option
<
A
>
{
/// Creates a new iterator with the specified closure as the "iterator
...
...
src/libcore/slice.rs
浏览文件 @
2f7a5f49
...
...
@@ -1291,6 +1291,17 @@ pub struct Splits<'a, T:'a, P> where P: FnMut(&T) -> bool {
finished
:
bool
}
// FIXME(#19839) Remove in favor of `#[deriving(Clone)]`
impl
<
'a
,
T
,
P
>
Clone
for
Splits
<
'a
,
T
,
P
>
where
P
:
Clone
+
FnMut
(
&
T
)
->
bool
{
fn
clone
(
&
self
)
->
Splits
<
'a
,
T
,
P
>
{
Splits
{
v
:
self
.v
,
pred
:
self
.pred
.clone
(),
finished
:
self
.finished
,
}
}
}
#[experimental
=
"needs review"
]
impl
<
'a
,
T
,
P
>
Iterator
<&
'a
[
T
]
>
for
Splits
<
'a
,
T
,
P
>
where
P
:
FnMut
(
&
T
)
->
bool
{
#[inline]
...
...
src/test/run-pass/issue-12677.rs
0 → 100644
浏览文件 @
2f7a5f49
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
fn
main
()
{
let
s
=
"Hello"
;
let
first
=
s
.bytes
();
let
second
=
first
.clone
();
assert_eq!
(
first
.collect
::
<
Vec
<
u8
>>
(),
second
.collect
::
<
Vec
<
u8
>>
())
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录