Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
4f559f8c
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
4f559f8c
编写于
1月 04, 2017
作者:
E
Eduard-Mihai Burtescu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rustc_typeck: force users of RegionScope to get anon_region's one by one.
上级
154c202a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
74 deletion
+39
-74
src/librustc_typeck/astconv.rs
src/librustc_typeck/astconv.rs
+7
-7
src/librustc_typeck/check/mod.rs
src/librustc_typeck/check/mod.rs
+3
-5
src/librustc_typeck/rscope.rs
src/librustc_typeck/rscope.rs
+29
-62
未找到文件。
src/librustc_typeck/astconv.rs
浏览文件 @
4f559f8c
...
...
@@ -306,9 +306,8 @@ pub fn opt_ast_region_to_region(&self,
ast_region_to_region
(
self
.tcx
(),
lifetime
)
}
None
=>
self
.tcx
()
.mk_region
(
match
rscope
.anon_regions
(
default_span
,
1
)
{
Ok
(
rs
)
=>
rs
[
0
],
Err
(
params
)
=>
{
None
=>
{
self
.tcx
()
.mk_region
(
rscope
.anon_region
(
default_span
)
.unwrap_or_else
(|
params
|
{
let
ampersand_span
=
Span
{
hi
:
default_span
.lo
,
..
default_span
};
let
mut
err
=
struct_span_err!
(
self
.tcx
()
.sess
,
ampersand_span
,
E0106
,
...
...
@@ -320,8 +319,8 @@ pub fn opt_ast_region_to_region(&self,
}
err
.emit
();
ty
::
ReStatic
}
}
)
}
))
}
};
debug!
(
"opt_ast_region_to_region(opt_lifetime={:?}) yields {:?}"
,
...
...
@@ -412,8 +411,9 @@ fn create_substs_for_ast_path(&self,
let
regions
=
if
expected_num_region_params
==
supplied_num_region_params
{
lifetimes
.iter
()
.map
(|
l
|
*
ast_region_to_region
(
tcx
,
l
))
.collect
()
}
else
{
let
anon_regions
=
rscope
.anon_regions
(
span
,
expected_num_region_params
);
let
anon_regions
=
(
0
..
expected_num_region_params
)
.map
(|
_
|
{
rscope
.anon_region
(
span
)
})
.collect
::
<
Result
<
Vec
<
_
>
,
_
>>
();
if
supplied_num_region_params
!=
0
||
anon_regions
.is_err
()
{
report_lifetime_number_error
(
tcx
,
span
,
...
...
src/librustc_typeck/check/mod.rs
浏览文件 @
4f559f8c
...
...
@@ -1466,11 +1466,9 @@ fn base_object_lifetime_default(&self, span: Span) -> ty::Region {
*
self
.next_region_var
(
infer
::
MiscVariable
(
span
))
}
fn
anon_regions
(
&
self
,
span
:
Span
,
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
Ok
((
0
..
count
)
.map
(|
_
|
{
*
self
.next_region_var
(
infer
::
MiscVariable
(
span
))
})
.collect
())
fn
anon_region
(
&
self
,
span
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
Ok
(
*
self
.next_region_var
(
infer
::
MiscVariable
(
span
)))
}
}
...
...
src/librustc_typeck/rscope.rs
浏览文件 @
4f559f8c
...
...
@@ -33,18 +33,16 @@ pub struct ElisionFailureInfo {
/// Defines strategies for handling regions that are omitted. For
/// example, if one writes the type `&Foo`, then the lifetime of
/// this reference has been omitted. When converting this
/// type, the generic functions in astconv will invoke `anon_region
s
`
/// type, the generic functions in astconv will invoke `anon_region`
/// on the provided region-scope to decide how to translate this
/// omitted region.
///
/// It is not always legal to omit regions, therefore `anon_region
s
`
/// It is not always legal to omit regions, therefore `anon_region`
/// can return `Err(())` to indicate that this is not a scope in which
/// regions can legally be omitted.
pub
trait
RegionScope
{
fn
anon_regions
(
&
self
,
span
:
Span
,
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
;
fn
anon_region
(
&
self
,
span
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
;
/// If an object omits any explicit lifetime bound, and none can
/// be derived from the object traits, what should we use? If
...
...
@@ -117,11 +115,9 @@ fn object_lifetime_default(&self, span: Span) -> Option<ty::Region> {
self
.base_scope
.object_lifetime_default
(
span
)
}
fn
anon_regions
(
&
self
,
span
:
Span
,
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
self
.base_scope
.anon_regions
(
span
,
count
)
fn
anon_region
(
&
self
,
span
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
self
.base_scope
.anon_region
(
span
)
}
fn
base_object_lifetime_default
(
&
self
,
span
:
Span
)
->
ty
::
Region
{
...
...
@@ -139,10 +135,8 @@ fn anon_type_scope(&self) -> Option<AnonTypeScope> {
pub
struct
ExplicitRscope
;
impl
RegionScope
for
ExplicitRscope
{
fn
anon_regions
(
&
self
,
_
span
:
Span
,
_
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
fn
anon_region
(
&
self
,
_
span
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
Err
(
None
)
}
...
...
@@ -165,12 +159,9 @@ pub fn new(v: Option<Vec<ElisionFailureInfo>>) -> UnelidableRscope {
}
impl
RegionScope
for
UnelidableRscope
{
fn
anon_regions
(
&
self
,
_
span
:
Span
,
_
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
let
UnelidableRscope
(
ref
v
)
=
*
self
;
Err
(
v
.clone
())
fn
anon_region
(
&
self
,
_
span
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
Err
(
self
.0
.clone
())
}
fn
object_lifetime_default
(
&
self
,
span
:
Span
)
->
Option
<
ty
::
Region
>
{
...
...
@@ -208,12 +199,10 @@ fn base_object_lifetime_default(&self, _span: Span) -> ty::Region {
ty
::
ReStatic
}
fn
anon_regions
(
&
self
,
_
span
:
Span
,
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
fn
anon_region
(
&
self
,
_
span
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
Ok
(
vec!
[
self
.default
;
count
]
)
Ok
(
self
.default
)
}
}
...
...
@@ -232,10 +221,8 @@ pub fn new(tcx: &'a ty::TyCtxt<'a, 'gcx, 'tcx>) -> Self {
}
impl
<
'a
,
'gcx
:
'a
+
'tcx
,
'tcx
:
'a
>
RegionScope
for
StaticRscope
<
'a
,
'gcx
,
'tcx
>
{
fn
anon_regions
(
&
self
,
span
:
Span
,
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
fn
anon_region
(
&
self
,
span
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
if
!
self
.tcx.sess.features
.borrow
()
.static_in_const
{
self
.tcx
.sess
...
...
@@ -244,7 +231,7 @@ fn anon_regions(&self,
`static_in_const` feature, see #35897"
)
.emit
();
}
Ok
(
vec!
[
ty
::
ReStatic
;
count
]
)
Ok
(
ty
::
ReStatic
)
}
fn
object_lifetime_default
(
&
self
,
span
:
Span
)
->
Option
<
ty
::
Region
>
{
...
...
@@ -268,12 +255,6 @@ pub fn new() -> BindingRscope {
anon_bindings
:
Cell
::
new
(
0
),
}
}
fn
next_region
(
&
self
)
->
ty
::
Region
{
let
idx
=
self
.anon_bindings
.get
();
self
.anon_bindings
.set
(
idx
+
1
);
ty
::
ReLateBound
(
ty
::
DebruijnIndex
::
new
(
1
),
ty
::
BrAnon
(
idx
))
}
}
impl
RegionScope
for
BindingRscope
{
...
...
@@ -288,12 +269,12 @@ fn base_object_lifetime_default(&self, _span: Span) -> ty::Region {
ty
::
ReStatic
}
fn
anon_regions
(
&
self
,
_
:
Span
,
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
fn
anon_region
(
&
self
,
_
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
Ok
((
0
..
count
)
.map
(|
_
|
self
.next_region
())
.collect
())
let
idx
=
self
.anon_bindings
.get
();
self
.anon_bindings
.set
(
idx
+
1
);
Ok
(
ty
::
ReLateBound
(
ty
::
DebruijnIndex
::
new
(
1
),
ty
::
BrAnon
(
idx
)))
}
}
...
...
@@ -334,12 +315,10 @@ fn base_object_lifetime_default(&self, span: Span) -> ty::Region {
self
.base_scope
.base_object_lifetime_default
(
span
)
}
fn
anon_regions
(
&
self
,
span
:
Span
,
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
fn
anon_region
(
&
self
,
span
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
self
.base_scope
.anon_region
s
(
span
,
count
)
self
.base_scope
.anon_region
(
span
)
}
fn
anon_type_scope
(
&
self
)
->
Option
<
AnonTypeScope
>
{
...
...
@@ -369,22 +348,10 @@ fn base_object_lifetime_default(&self, span: Span) -> ty::Region {
ty
::
fold
::
shift_region
(
self
.base_scope
.base_object_lifetime_default
(
span
),
1
)
}
fn
anon_regions
(
&
self
,
span
:
Span
,
count
:
usize
)
->
Result
<
Vec
<
ty
::
Region
>
,
Option
<
Vec
<
ElisionFailureInfo
>>>
fn
anon_region
(
&
self
,
span
:
Span
)
->
Result
<
ty
::
Region
,
Option
<
Vec
<
ElisionFailureInfo
>>>
{
match
self
.base_scope
.anon_regions
(
span
,
count
)
{
Ok
(
mut
v
)
=>
{
for
r
in
&
mut
v
{
*
r
=
ty
::
fold
::
shift_region
(
*
r
,
1
);
}
Ok
(
v
)
}
Err
(
errs
)
=>
{
Err
(
errs
)
}
}
self
.base_scope
.anon_region
(
span
)
.map
(|
r
|
ty
::
fold
::
shift_region
(
r
,
1
))
}
fn
anon_type_scope
(
&
self
)
->
Option
<
AnonTypeScope
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录