Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
2e5f0b3c
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,发现更多精彩内容 >>
未验证
提交
2e5f0b3c
编写于
4月 28, 2019
作者:
F
flip1995
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove unused TyCtxt argument from allow_two_phase_borrow function
上级
86ed3116
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
6 addition
and
9 deletion
+6
-9
src/librustc_mir/borrow_check/borrow_set.rs
src/librustc_mir/borrow_check/borrow_set.rs
+1
-1
src/librustc_mir/borrow_check/mod.rs
src/librustc_mir/borrow_check/mod.rs
+2
-2
src/librustc_mir/borrow_check/nll/invalidation.rs
src/librustc_mir/borrow_check/nll/invalidation.rs
+2
-2
src/librustc_mir/borrow_check/path_utils.rs
src/librustc_mir/borrow_check/path_utils.rs
+1
-4
未找到文件。
src/librustc_mir/borrow_check/borrow_set.rs
浏览文件 @
2e5f0b3c
...
...
@@ -315,7 +315,7 @@ fn insert_as_pending_if_two_phase(
start_location
,
assigned_place
,
borrow_index
,
);
if
!
allow_two_phase_borrow
(
self
.tcx
,
kind
)
{
if
!
allow_two_phase_borrow
(
kind
)
{
debug!
(
" -> {:?}"
,
start_location
);
return
;
}
...
...
src/librustc_mir/borrow_check/mod.rs
浏览文件 @
2e5f0b3c
...
...
@@ -1076,7 +1076,7 @@ fn check_access_for_conflict(
(
Read
(
kind
),
BorrowKind
::
Unique
)
|
(
Read
(
kind
),
BorrowKind
::
Mut
{
..
})
=>
{
// Reading from mere reservations of mutable-borrows is OK.
if
!
is_active
(
&
this
.dominators
,
borrow
,
context
.loc
)
{
assert
!
(
allow_two_phase_borrow
(
tcx
,
borrow
.kind
));
assert
!
(
allow_two_phase_borrow
(
borrow
.kind
));
return
Control
::
Continue
;
}
...
...
@@ -1233,7 +1233,7 @@ fn consume_rvalue(
BorrowKind
::
Shared
=>
(
Deep
,
Read
(
ReadKind
::
Borrow
(
bk
))),
BorrowKind
::
Unique
|
BorrowKind
::
Mut
{
..
}
=>
{
let
wk
=
WriteKind
::
MutableBorrow
(
bk
);
if
allow_two_phase_borrow
(
self
.infcx.tcx
,
bk
)
{
if
allow_two_phase_borrow
(
bk
)
{
(
Deep
,
Reservation
(
wk
))
}
else
{
(
Deep
,
Write
(
wk
))
...
...
src/librustc_mir/borrow_check/nll/invalidation.rs
浏览文件 @
2e5f0b3c
...
...
@@ -321,7 +321,7 @@ fn consume_rvalue(
BorrowKind
::
Shared
=>
(
Deep
,
Read
(
ReadKind
::
Borrow
(
bk
))),
BorrowKind
::
Unique
|
BorrowKind
::
Mut
{
..
}
=>
{
let
wk
=
WriteKind
::
MutableBorrow
(
bk
);
if
allow_two_phase_borrow
(
self
.tcx
,
bk
)
{
if
allow_two_phase_borrow
(
bk
)
{
(
Deep
,
Reservation
(
wk
))
}
else
{
(
Deep
,
Write
(
wk
))
...
...
@@ -439,7 +439,7 @@ fn check_access_for_conflict(
// Reading from mere reservations of mutable-borrows is OK.
if
!
is_active
(
&
this
.dominators
,
borrow
,
context
.loc
)
{
// If the borrow isn't active yet, reads don't invalidate it
assert
!
(
allow_two_phase_borrow
(
this
.tcx
,
borrow
.kind
));
assert
!
(
allow_two_phase_borrow
(
borrow
.kind
));
return
Control
::
Continue
;
}
...
...
src/librustc_mir/borrow_check/path_utils.rs
浏览文件 @
2e5f0b3c
...
...
@@ -11,10 +11,7 @@
/// Returns `true` if the borrow represented by `kind` is
/// allowed to be split into separate Reservation and
/// Activation phases.
pub
(
super
)
fn
allow_two_phase_borrow
<
'a
,
'tcx
,
'gcx
:
'tcx
>
(
_
tcx
:
TyCtxt
<
'a
,
'gcx
,
'tcx
>
,
kind
:
BorrowKind
)
->
bool
{
pub
(
super
)
fn
allow_two_phase_borrow
<
'a
,
'tcx
,
'gcx
:
'tcx
>
(
kind
:
BorrowKind
)
->
bool
{
kind
.allows_two_phase_borrow
()
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录