Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
fd8f56ef
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,发现更多精彩内容 >>
提交
fd8f56ef
编写于
4月 03, 2013
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Link lifetimes of autoslice'd vectors (Issue #3184)
Fixes #5739.
上级
13801f60
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
97 addition
and
10 deletion
+97
-10
src/librustc/middle/ty.rs
src/librustc/middle/ty.rs
+3
-3
src/librustc/middle/typeck/check/regionck.rs
src/librustc/middle/typeck/check/regionck.rs
+46
-7
src/test/run-pass/region-dependent-addr-of.rs
src/test/run-pass/region-dependent-addr-of.rs
+3
-0
src/test/run-pass/region-dependent-autofn.rs
src/test/run-pass/region-dependent-autofn.rs
+22
-0
src/test/run-pass/region-dependent-autoslice.rs
src/test/run-pass/region-dependent-autoslice.rs
+23
-0
未找到文件。
src/librustc/middle/ty.rs
浏览文件 @
fd8f56ef
...
@@ -197,13 +197,13 @@ pub enum AutoRefKind {
...
@@ -197,13 +197,13 @@ pub enum AutoRefKind {
/// Convert from T to &T
/// Convert from T to &T
AutoPtr
,
AutoPtr
,
/// Convert from @[]/~[] to &[] (or str)
/// Convert from @[]/~[]
/&[]
to &[] (or str)
AutoBorrowVec
,
AutoBorrowVec
,
/// Convert from @[]/~[] to &&[] (or str)
/// Convert from @[]/~[]
/&[]
to &&[] (or str)
AutoBorrowVecRef
,
AutoBorrowVecRef
,
/// Convert from @fn()/~fn() to &fn()
/// Convert from @fn()/~fn()
/&fn()
to &fn()
AutoBorrowFn
AutoBorrowFn
}
}
...
...
src/librustc/middle/typeck/check/regionck.rs
浏览文件 @
fd8f56ef
...
@@ -494,8 +494,8 @@ pub mod guarantor {
...
@@ -494,8 +494,8 @@ pub mod guarantor {
* inferencer would not know of this dependency and thus it might
* inferencer would not know of this dependency and thus it might
* infer the lifetime of L2 to be greater than L1 (issue #3148).
* infer the lifetime of L2 to be greater than L1 (issue #3148).
*
*
* There are a number of troublesome scenarios in the test
* There are a number of troublesome scenarios in the test
s
* `region-dependent-
addr-of
.rs`, but here is one example:
* `region-dependent-
*
.rs`, but here is one example:
*
*
* struct Foo { i: int }
* struct Foo { i: int }
* struct Bar { foo: Foo }
* struct Bar { foo: Foo }
...
@@ -583,8 +583,35 @@ pub fn for_autoref(rcx: @mut Rcx,
...
@@ -583,8 +583,35 @@ pub fn for_autoref(rcx: @mut Rcx,
let
mut
expr_ct
=
categorize_unadjusted
(
rcx
,
expr
);
let
mut
expr_ct
=
categorize_unadjusted
(
rcx
,
expr
);
expr_ct
=
apply_autoderefs
(
expr_ct
=
apply_autoderefs
(
rcx
,
expr
,
autoderefs
,
expr_ct
);
rcx
,
expr
,
autoderefs
,
expr_ct
);
for
expr_ct
.cat.guarantor.each
|
g
|
{
infallibly_mk_subr
(
rcx
,
true
,
expr
.span
,
autoref
.region
,
*
g
);
match
autoref
.kind
{
ty
::
AutoPtr
=>
{
// In this case, we are implicitly adding an `&`.
maybe_make_subregion
(
rcx
,
expr
,
autoref
.region
,
expr_ct
.cat.guarantor
);
}
ty
::
AutoBorrowVec
|
ty
::
AutoBorrowVecRef
|
ty
::
AutoBorrowFn
=>
{
// In each of these cases, what is being borrowed is
// not the (autoderef'd) expr itself but rather the
// contents of the autoderef'd expression (i.e., what
// the pointer points at).
maybe_make_subregion
(
rcx
,
expr
,
autoref
.region
,
guarantor_of_deref
(
&
expr_ct
.cat
));
}
}
fn
maybe_make_subregion
(
rcx
:
@
mut
Rcx
,
expr
:
@
ast
::
expr
,
sub_region
:
ty
::
Region
,
sup_region
:
Option
<
ty
::
Region
>
)
{
for
sup_region
.each
|
r
|
{
infallibly_mk_subr
(
rcx
,
true
,
expr
.span
,
sub_region
,
*
r
);
}
}
}
}
}
...
@@ -813,19 +840,31 @@ fn apply_autoderefs(
...
@@ -813,19 +840,31 @@ fn apply_autoderefs(
fn
pointer_categorize
(
ty
:
ty
::
t
)
->
PointerCategorization
{
fn
pointer_categorize
(
ty
:
ty
::
t
)
->
PointerCategorization
{
match
ty
::
get
(
ty
)
.sty
{
match
ty
::
get
(
ty
)
.sty
{
ty
::
ty_rptr
(
r
,
_
)
|
ty
::
ty_evec
(
_
,
ty
::
vstore_slice
(
r
))
|
ty
::
ty_rptr
(
r
,
_
)
|
ty
::
ty_evec
(
_
,
ty
::
vstore_slice
(
r
))
|
ty
::
ty_estr
(
ty
::
vstore_slice
(
r
))
=>
{
ty
::
ty_estr
(
ty
::
vstore_slice
(
r
))
=>
{
BorrowedPointer
(
r
)
BorrowedPointer
(
r
)
}
}
ty
::
ty_uniq
(
*
)
|
ty
::
ty_estr
(
ty
::
vstore_uniq
)
|
ty
::
ty_uniq
(
*
)
|
ty
::
ty_estr
(
ty
::
vstore_uniq
)
|
ty
::
ty_evec
(
_
,
ty
::
vstore_uniq
)
=>
{
ty
::
ty_evec
(
_
,
ty
::
vstore_uniq
)
=>
{
OwnedPointer
OwnedPointer
}
}
ty
::
ty_box
(
*
)
|
ty
::
ty_ptr
(
*
)
|
ty
::
ty_box
(
*
)
|
ty
::
ty_ptr
(
*
)
|
ty
::
ty_evec
(
_
,
ty
::
vstore_box
)
|
ty
::
ty_evec
(
_
,
ty
::
vstore_box
)
|
ty
::
ty_estr
(
ty
::
vstore_box
)
=>
{
ty
::
ty_estr
(
ty
::
vstore_box
)
=>
{
OtherPointer
OtherPointer
}
}
ty
::
ty_closure
(
ref
closure_ty
)
=>
{
match
closure_ty
.sigil
{
ast
::
BorrowedSigil
=>
BorrowedPointer
(
closure_ty
.region
),
ast
::
OwnedSigil
=>
OwnedPointer
,
// NOTE This is...not quite right. Deduce a test etc.
ast
::
ManagedSigil
=>
OtherPointer
,
}
}
_
=>
{
_
=>
{
NotPointer
NotPointer
}
}
...
...
src/test/run-pass/region-dependent-addr-of.rs
浏览文件 @
fd8f56ef
...
@@ -8,6 +8,9 @@
...
@@ -8,6 +8,9 @@
// option. This file may not be copied, modified, or distributed
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// except according to those terms.
// Test lifetimes are linked properly when we create dependent region pointers.
// Issue #3148.
struct
A
{
struct
A
{
value
:
B
value
:
B
}
}
...
...
src/test/run-pass/region-dependent-autofn.rs
0 → 100644
浏览文件 @
fd8f56ef
// Copyright 2012 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.
// Test lifetimes are linked properly when we autoslice a vector.
// Issue #3148.
fn
subslice
<
'r
>
(
v
:
&
'r
fn
())
->
&
'r
fn
()
{
v
}
fn
both
<
'r
>
(
v
:
&
'r
fn
())
->
&
'r
fn
()
{
subslice
(
subslice
(
v
))
}
fn
main
()
{
both
(
main
);
}
src/test/run-pass/region-dependent-autoslice.rs
0 → 100644
浏览文件 @
fd8f56ef
// Copyright 2012 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.
// Test lifetimes are linked properly when we autoslice a vector.
// Issue #3148.
fn
subslice1
<
'r
>
(
v
:
&
'r
[
uint
])
->
&
'r
[
uint
]
{
v
}
fn
both
<
'r
>
(
v
:
&
'r
[
uint
])
->
&
'r
[
uint
]
{
subslice1
(
subslice1
(
v
))
}
fn
main
()
{
let
v
=
~
[
1
,
2
,
3
];
both
(
v
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录