Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
1b24602c
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,发现更多精彩内容 >>
提交
1b24602c
编写于
12月 10, 2014
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Extract leak check into a distinct subroutine.
上级
885f7ee1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
32 addition
and
18 deletion
+32
-18
src/librustc/middle/infer/higher_ranked/mod.rs
src/librustc/middle/infer/higher_ranked/mod.rs
+32
-18
未找到文件。
src/librustc/middle/infer/higher_ranked/mod.rs
浏览文件 @
1b24602c
...
...
@@ -84,30 +84,17 @@ fn higher_ranked_sub<T>(&self, a: &T, b: &T) -> cres<'tcx, T>
// Presuming type comparison succeeds, we need to check
// that the skolemized regions do not "leak".
let
new_vars
=
self
.infcx
()
.region_vars_confined_to_snapshot
(
snapshot
);
for
(
&
skol_br
,
&
skol
)
in
skol_map
.iter
()
{
let
tainted
=
self
.infcx
()
.tainted_regions
(
snapshot
,
skol
);
for
tainted_region
in
tainted
.iter
()
{
// Each skolemized should only be relatable to itself
// or new variables:
match
*
tainted_region
{
ty
::
ReInfer
(
ty
::
ReVar
(
ref
vid
))
=>
{
if
new_vars
.iter
()
.any
(|
x
|
x
==
vid
)
{
continue
;
}
}
_
=>
{
if
*
tainted_region
==
skol
{
continue
;
}
}
};
// A is not as polymorphic as B:
match
leak_check
(
self
.infcx
(),
&
skol_map
,
snapshot
)
{
Ok
(())
=>
{
}
Err
((
skol_br
,
tainted_region
))
=>
{
if
self
.a_is_expected
()
{
debug!
(
"Not as polymorphic!"
);
return
Err
(
ty
::
terr_regions_insufficiently_polymorphic
(
skol_br
,
*
tainted_region
));
tainted_region
));
}
else
{
debug!
(
"Overly polymorphic!"
);
return
Err
(
ty
::
terr_regions_overly_polymorphic
(
skol_br
,
*
tainted_region
));
tainted_region
));
}
}
}
...
...
@@ -548,3 +535,30 @@ fn skolemize_regions<'a,'tcx,HR>(infcx: &InferCtxt<'a,'tcx>,
skol
})
}
fn
leak_check
<
'a
,
'tcx
>
(
infcx
:
&
InferCtxt
<
'a
,
'tcx
>
,
skol_map
:
&
FnvHashMap
<
ty
::
BoundRegion
,
ty
::
Region
>
,
snapshot
:
&
CombinedSnapshot
)
->
Result
<
(),(
ty
::
BoundRegion
,
ty
::
Region
)
>
{
let
new_vars
=
infcx
.region_vars_confined_to_snapshot
(
snapshot
);
for
(
&
skol_br
,
&
skol
)
in
skol_map
.iter
()
{
let
tainted
=
infcx
.tainted_regions
(
snapshot
,
skol
);
for
&
tainted_region
in
tainted
.iter
()
{
// Each skolemized should only be relatable to itself
// or new variables:
match
tainted_region
{
ty
::
ReInfer
(
ty
::
ReVar
(
vid
))
=>
{
if
new_vars
.iter
()
.any
(|
&
x
|
x
==
vid
)
{
continue
;
}
}
_
=>
{
if
tainted_region
==
skol
{
continue
;
}
}
};
// A is not as polymorphic as B:
return
Err
((
skol_br
,
tainted_region
));
}
}
Ok
(())
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录