Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
01cb1044
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,发现更多精彩内容 >>
提交
01cb1044
编写于
12月 20, 2011
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update pprinter to understand ret type of block, add warnings
上级
6a901409
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
19 addition
and
4 deletion
+19
-4
src/comp/middle/typeck.rs
src/comp/middle/typeck.rs
+14
-4
src/comp/syntax/print/pprust.rs
src/comp/syntax/print/pprust.rs
+5
-0
未找到文件。
src/comp/middle/typeck.rs
浏览文件 @
01cb1044
...
@@ -1512,6 +1512,10 @@ fn check_expr_fn_with_unifier(fcx: @fn_ctxt,
...
@@ -1512,6 +1512,10 @@ fn check_expr_fn_with_unifier(fcx: @fn_ctxt,
let
fty
=
ty_of_fn_decl
(
tcx
,
m_check_tyvar
(
fcx
),
decl
,
let
fty
=
ty_of_fn_decl
(
tcx
,
m_check_tyvar
(
fcx
),
decl
,
proto
,
[],
none
)
.ty
;
proto
,
[],
none
)
.ty
;
log
#
fmt
(
"check_expr_fn_with_unifier %s fty=%s"
,
expr_to_str
(
expr
),
ty_to_str
(
tcx
,
fty
));
write
::
ty_only_fixup
(
fcx
,
expr
.id
,
fty
);
write
::
ty_only_fixup
(
fcx
,
expr
.id
,
fty
);
// Unify the type of the function with the expected type before we
// Unify the type of the function with the expected type before we
...
@@ -1521,9 +1525,6 @@ fn check_expr_fn_with_unifier(fcx: @fn_ctxt,
...
@@ -1521,9 +1525,6 @@ fn check_expr_fn_with_unifier(fcx: @fn_ctxt,
unify
(
fcx
,
expr
.span
,
expected
,
fty
);
unify
(
fcx
,
expr
.span
,
expected
,
fty
);
check_fn1
(
fcx
.ccx
,
decl
,
proto
,
body
,
expr
.id
,
some
(
fcx
));
check_fn1
(
fcx
.ccx
,
decl
,
proto
,
body
,
expr
.id
,
some
(
fcx
));
if
proto
==
ast
::
proto_block
{
write
::
ty_only_fixup
(
fcx
,
expr
.id
,
expected
);
}
}
}
fn
check_expr_with_unifier
(
fcx
:
@
fn_ctxt
,
expr
:
@
ast
::
expr
,
unify
:
unifier
,
fn
check_expr_with_unifier
(
fcx
:
@
fn_ctxt
,
expr
:
@
ast
::
expr
,
unify
:
unifier
,
...
@@ -1979,11 +1980,20 @@ fn check_binop_type_compat(fcx: @fn_ctxt, span: span, ty: ty::t,
...
@@ -1979,11 +1980,20 @@ fn check_binop_type_compat(fcx: @fn_ctxt, span: span, ty: ty::t,
// Take the prototype from the expected type, but default to block:
// Take the prototype from the expected type, but default to block:
let
proto
=
alt
ty
::
struct
(
tcx
,
expected
)
{
let
proto
=
alt
ty
::
struct
(
tcx
,
expected
)
{
ty
::
ty_fn
(
proto
,
_
,
_
,
_
,
_
)
{
proto
}
ty
::
ty_fn
(
proto
,
_
,
_
,
_
,
_
)
{
proto
}
_
{
ast
::
proto_block
}
_
{
fcx
.ccx.tcx.sess
.span_warn
(
expr
.span
,
"unable to infer kind of closure, defaulting to block"
);
ast
::
proto_block
}
};
};
log
#
fmt
(
"checking expr_fn_block %s expected=%s"
,
expr_to_str
(
expr
),
ty_to_str
(
tcx
,
expected
));
check_expr_fn_with_unifier
(
fcx
,
expr
,
decl
,
check_expr_fn_with_unifier
(
fcx
,
expr
,
decl
,
proto
,
body
,
proto
,
body
,
unify
,
expected
);
unify
,
expected
);
write
::
ty_only_fixup
(
fcx
,
id
,
expected
);
}
}
ast
::
expr_block
(
b
)
{
ast
::
expr_block
(
b
)
{
// If this is an unchecked block, turn off purity-checking
// If this is an unchecked block, turn off purity-checking
...
...
src/comp/syntax/print/pprust.rs
浏览文件 @
01cb1044
...
@@ -1161,6 +1161,11 @@ fn print_arg(s: ps, x: ast::arg) {
...
@@ -1161,6 +1161,11 @@ fn print_arg(s: ps, x: ast::arg) {
}
}
commasep
(
s
,
inconsistent
,
decl
.inputs
,
print_arg
);
commasep
(
s
,
inconsistent
,
decl
.inputs
,
print_arg
);
word
(
s
.s
,
"|"
);
word
(
s
.s
,
"|"
);
if
decl
.output.node
!=
ast
::
ty_infer
{
space_if_not_bol
(
s
);
word_space
(
s
,
"->"
);
print_type
(
s
,
decl
.output
);
}
maybe_print_comment
(
s
,
decl
.output.span.lo
);
maybe_print_comment
(
s
,
decl
.output.span.lo
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录