Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
1ffcc6fc
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,发现更多精彩内容 >>
提交
1ffcc6fc
编写于
6月 13, 2013
作者:
B
Ben Blum
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow ~fn:Copy() to be copied.
上级
c454e95f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
73 addition
and
7 deletion
+73
-7
src/librustc/middle/ty.rs
src/librustc/middle/ty.rs
+20
-7
src/test/run-pass/closure-bounds-copyable-squiggle-closure.rs
...test/run-pass/closure-bounds-copyable-squiggle-closure.rs
+25
-0
src/test/run-pass/closure-bounds-squiggle-closure-as-copyable-typaram.rs
...ss/closure-bounds-squiggle-closure-as-copyable-typaram.rs
+28
-0
未找到文件。
src/librustc/middle/ty.rs
浏览文件 @
1ffcc6fc
...
...
@@ -1856,7 +1856,7 @@ pub fn is_copy(&self, cx: ctxt) -> bool {
}
pub
fn
noncopyable
(
_
cx
:
ctxt
)
->
TypeContents
{
TC_DTOR
+
TC_BORROWED_MUT
+
TC_ONCE_CLOSURE
+
TC_
OWNED_CLOSURE
+
TC_DTOR
+
TC_BORROWED_MUT
+
TC_ONCE_CLOSURE
+
TC_
NONCOPY_TRAIT
+
TC_EMPTY_ENUM
}
...
...
@@ -1905,13 +1905,19 @@ pub fn nonimplicitly_copyable(cx: ctxt) -> TypeContents {
}
pub
fn
needs_drop
(
&
self
,
cx
:
ctxt
)
->
bool
{
if
self
.intersects
(
TC_NONCOPY_TRAIT
)
{
// Currently all noncopyable existentials are 2nd-class types
// behind owned pointers. With dynamically-sized types, remove
// this assertion.
assert
!
(
self
.intersects
(
TC_OWNED_POINTER
));
}
let
tc
=
TC_MANAGED
+
TC_DTOR
+
TypeContents
::
owned
(
cx
);
self
.intersects
(
tc
)
}
pub
fn
owned
(
_
cx
:
ctxt
)
->
TypeContents
{
//! Any kind of owned contents.
TC_OWNED_
CLOSURE
+
TC_OWNED_
POINTER
+
TC_OWNED_VEC
TC_OWNED_POINTER
+
TC_OWNED_VEC
}
}
...
...
@@ -1945,8 +1951,8 @@ fn to_str(&self) -> ~str {
/// Contains an owned vector ~[] or owned string ~str
static
TC_OWNED_VEC
:
TypeContents
=
TypeContents
{
bits
:
0b0000_0000_0100
};
/// Contains a
~fn() or a ~Trait, which is non-copyable
.
static
TC_
OWNED_CLOSURE
:
TypeContents
=
TypeContents
{
bits
:
0b0000_0000_1000
};
/// Contains a
non-copyable ~fn() or a ~Trait (NOT a ~fn:Copy() or ~Trait:Copy)
.
static
TC_
NONCOPY_TRAIT
:
TypeContents
=
TypeContents
{
bits
:
0b0000_0000_1000
};
/// Type with a destructor
static
TC_DTOR
:
TypeContents
=
TypeContents
{
bits
:
0b0000_0001_0000
};
...
...
@@ -2061,7 +2067,8 @@ fn tc_ty(cx: ctxt,
}
ty_trait
(
_
,
_
,
UniqTraitStore
,
_
,
_
bounds
)
=>
{
TC_OWNED_CLOSURE
// FIXME(#3569): Make this conditional on the trait's bounds.
TC_NONCOPY_TRAIT
+
TC_OWNED_POINTER
}
ty_trait
(
_
,
_
,
BoxTraitStore
,
mutbl
,
_
bounds
)
=>
{
...
...
@@ -2184,7 +2191,9 @@ fn tc_ty(cx: ctxt,
match
sigil
{
ast
::
BorrowedSigil
=>
TC_BORROWED_POINTER
,
ast
::
ManagedSigil
=>
TC_MANAGED
,
ast
::
OwnedSigil
=>
TC_OWNED_CLOSURE
// FIXME(#3569): Looks like noncopyability should depend
// on the bounds, but I don't think this case ever comes up.
ast
::
OwnedSigil
=>
TC_NONCOPY_TRAIT
+
TC_OWNED_POINTER
,
}
}
...
...
@@ -2258,7 +2267,11 @@ fn closure_contents(cty: &ClosureTy) -> TypeContents {
let
st
=
match
cty
.sigil
{
ast
::
BorrowedSigil
=>
TC_BORROWED_POINTER
,
ast
::
ManagedSigil
=>
TC_MANAGED
,
ast
::
OwnedSigil
=>
TC_OWNED_CLOSURE
ast
::
OwnedSigil
=>
if
cty
.bounds
.contains_elem
(
BoundCopy
)
{
TC_OWNED_POINTER
}
else
{
TC_OWNED_POINTER
+
TC_NONCOPY_TRAIT
}
};
let
rt
=
borrowed_contents
(
cty
.region
,
m_imm
);
let
ot
=
match
cty
.onceness
{
...
...
src/test/run-pass/closure-bounds-copyable-squiggle-closure.rs
0 → 100644
浏览文件 @
1ffcc6fc
// Copyright 2013 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.
// xfail-pretty
// Tests correct copying of heap closures' environments.
fn
foo
(
x
:
~
fn
:
Copy
())
->
(
~
fn
(),
~
fn
())
{
(
copy
x
,
x
)
}
fn
main
()
{
let
v
=
~
[
~
[
1
,
2
,
3
],
~
[
4
,
5
,
6
]];
// shouldn't get double-freed
let
(
f1
,
f2
)
=
do
foo
{
assert
!
(
v
.len
()
==
2
);
};
f1
();
f2
();
}
src/test/run-pass/closure-bounds-squiggle-closure-as-copyable-typaram.rs
0 → 100644
浏览文件 @
1ffcc6fc
// Copyright 2013 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.
// xfail-pretty
// Tests correct copying of heap closures' environments.
fn
bar
<
T
:
Copy
>
(
x
:
T
)
->
(
T
,
T
)
{
(
copy
x
,
x
)
}
fn
foo
(
x
:
~
fn
:
Copy
())
->
(
~
fn
(),
~
fn
())
{
bar
(
x
)
}
fn
main
()
{
let
v
=
~
[
~
[
1
,
2
,
3
],
~
[
4
,
5
,
6
]];
// shouldn't get double-freed
let
(
f1
,
f2
)
=
do
foo
{
assert
!
(
v
.len
()
==
2
);
};
f1
();
f2
();
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录