Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
688ab5af
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,发现更多精彩内容 >>
提交
688ab5af
编写于
11月 27, 2017
作者:
S
Santiago Pastorino
提交者:
Niko Matsakis
12月 13, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Check functions predicates
上级
50104966
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
70 addition
and
2 deletion
+70
-2
src/librustc_mir/transform/type_check.rs
src/librustc_mir/transform/type_check.rs
+42
-2
src/test/compile-fail/nll/where_clauses_in_functions.rs
src/test/compile-fail/nll/where_clauses_in_functions.rs
+28
-0
未找到文件。
src/librustc_mir/transform/type_check.rs
浏览文件 @
688ab5af
...
...
@@ -59,7 +59,10 @@ pub fn type_check<'a, 'gcx, 'tcx>(
}
fn
mirbug
(
tcx
:
TyCtxt
,
span
:
Span
,
msg
:
&
str
)
{
tcx
.sess
.diagnostic
()
.span_bug
(
span
,
msg
);
// We sometimes see MIR failures (notably predicate failures) due to
// the fact that we check rvalue sized predicates here. So use `delay_span_bug`
// to avoid reporting bugs in those cases.
tcx
.sess
.diagnostic
()
.delay_span_bug
(
span
,
msg
);
}
macro_rules!
span_mirbug
{
...
...
@@ -171,7 +174,44 @@ fn sanitize_constant(&mut self, constant: &Constant<'tcx>, location: Location) {
);
let
expected_ty
=
match
constant
.literal
{
Literal
::
Value
{
value
}
=>
value
.ty
,
Literal
::
Value
{
value
}
=>
{
if
let
ConstVal
::
Function
(
def_id
,
..
)
=
value
.val
{
let
tcx
=
self
.tcx
();
let
type_checker
=
&
mut
self
.cx
;
// FIXME -- For now, use the substitutions from
// `value.ty` rather than `value.val`. The
// renumberer will rewrite them to independent
// sets of regions; in principle, we ought to
// derive the type of the `value.val` from "first
// principles" and equate with value.ty, but as we
// are transitioning to the miri-based system, we
// don't have a handy function for that, so for
// now we just ignore `value.val` regions.
let
substs
=
match
value
.ty.sty
{
ty
::
TyFnDef
(
ty_def_id
,
substs
)
=>
{
assert_eq!
(
def_id
,
ty_def_id
);
substs
}
_
=>
{
span_bug!
(
self
.last_span
,
"unexpected type for constant function: {:?}"
,
value
.ty
)
}
};
let
instantiated_predicates
=
tcx
.predicates_of
(
def_id
)
.instantiate
(
tcx
,
substs
);
let
predicates
=
type_checker
.normalize
(
&
instantiated_predicates
.predicates
,
location
);
type_checker
.prove_predicates
(
&
predicates
,
location
);
}
value
.ty
}
Literal
::
Promoted
{
..
}
=>
{
// FIXME -- promoted MIR return types reference
// various "free regions" (e.g., scopes and things)
...
...
src/test/compile-fail/nll/where_clauses_in_functions.rs
0 → 100644
浏览文件 @
688ab5af
// Copyright 2017 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.
// compile-flags: -Z borrowck=mir -Z nll
#![allow(dead_code)]
fn
foo
<
'a
,
'b
>
(
x
:
&
'a
u32
,
y
:
&
'b
u32
)
->
(
&
'a
u32
,
&
'b
u32
)
where
'a
:
'b
,
{
(
x
,
y
)
}
fn
bar
<
'a
,
'b
>
(
x
:
&
'a
u32
,
y
:
&
'b
u32
)
->
(
&
'a
u32
,
&
'b
u32
)
{
foo
(
x
,
y
)
//~^ ERROR free region `'_#1r` does not outlive free region `'_#2r`
//~| WARNING not reporting region error due to -Znll
}
fn
main
()
{}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录