Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
7ff11d7b
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,发现更多精彩内容 >>
提交
7ff11d7b
编写于
2月 22, 2015
作者:
F
Flavio Percoco
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Unify lifetime/type arguments error messages for (non-)builtin bounds
上级
a1945197
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
50 addition
and
33 deletion
+50
-33
src/librustc_typeck/astconv.rs
src/librustc_typeck/astconv.rs
+44
-27
src/librustc_typeck/diagnostics.rs
src/librustc_typeck/diagnostics.rs
+0
-1
src/test/compile-fail/typeck-builtin-bound-type-parameters.rs
...test/compile-fail/typeck-builtin-bound-type-parameters.rs
+6
-5
未找到文件。
src/librustc_typeck/astconv.rs
浏览文件 @
7ff11d7b
...
...
@@ -305,9 +305,9 @@ fn create_region_substs<'tcx>(
rscope
.anon_regions
(
span
,
expected_num_region_params
);
if
supplied_num_region_params
!=
0
||
anon_regions
.is_err
()
{
span_err!
(
tcx
.sess
,
span
,
E0107
,
"wrong number of lifetime parameters: expected {}, found {}"
,
expected_num_region_params
,
suppli
ed_num_region_params
);
report_lifetime_number_error
(
tcx
,
span
,
supplied_num_region_params
,
expect
ed_num_region_params
);
}
match
anon_regions
{
...
...
@@ -355,31 +355,14 @@ fn create_substs_for_ast_path<'tcx>(
.count
();
let
mut
type_substs
=
types_provided
;
check_type_argument_count
(
this
.tcx
(),
span
,
supplied_ty_param_count
,
required_ty_param_count
,
formal_ty_param_count
);
if
supplied_ty_param_count
<
required_ty_param_count
{
let
expected
=
if
required_ty_param_count
<
formal_ty_param_count
{
"expected at least"
}
else
{
"expected"
};
span_err!
(
this
.tcx
()
.sess
,
span
,
E0243
,
"wrong number of type arguments: {} {}, found {}"
,
expected
,
required_ty_param_count
,
supplied_ty_param_count
);
while
type_substs
.len
()
<
required_ty_param_count
{
type_substs
.push
(
tcx
.types.err
);
}
}
else
if
supplied_ty_param_count
>
formal_ty_param_count
{
let
expected
=
if
required_ty_param_count
<
formal_ty_param_count
{
"expected at most"
}
else
{
"expected"
};
span_err!
(
this
.tcx
()
.sess
,
span
,
E0244
,
"wrong number of type arguments: {} {}, found {}"
,
expected
,
formal_ty_param_count
,
supplied_ty_param_count
);
type_substs
.truncate
(
formal_ty_param_count
);
}
assert
!
(
type_substs
.len
()
>=
required_ty_param_count
&&
...
...
@@ -1849,10 +1832,13 @@ pub fn partition_bounds<'a>(tcx: &ty::ctxt,
&
mut
builtin_bounds
)
{
let
segments
=
&
b
.trait_ref.path.segments
;
let
parameters
=
&
segments
[
segments
.len
()
-
1
]
.parameters
;
if
!
parameters
.is_empty
()
{
span_err!
(
tcx
.sess
,
b
.trait_ref.path.span
,
E0316
,
"builtin bounds do not require arguments, {} given"
,
parameters
.lifetimes
()
.len
()
+
parameters
.types
()
.len
());
if
parameters
.types
()
.len
()
>
0
{
check_type_argument_count
(
tcx
,
b
.trait_ref.path.span
,
parameters
.types
()
.len
(),
0
,
0
);
}
if
parameters
.lifetimes
()
.len
()
>
0
{
report_lifetime_number_error
(
tcx
,
b
.trait_ref.path.span
,
parameters
.lifetimes
()
.len
(),
0
);
}
continue
;
// success
}
...
...
@@ -1886,3 +1872,34 @@ fn prohibit_projections<'tcx>(tcx: &ty::ctxt<'tcx>,
"associated type bindings are not allowed here"
);
}
}
fn
check_type_argument_count
(
tcx
:
&
ty
::
ctxt
,
span
:
Span
,
supplied
:
usize
,
required
:
usize
,
accepted
:
usize
)
{
if
supplied
<
required
{
let
expected
=
if
required
<
accepted
{
"expected at least"
}
else
{
"expected"
};
span_err!
(
tcx
.sess
,
span
,
E0243
,
"wrong number of type arguments: {} {}, found {}"
,
expected
,
required
,
supplied
);
}
else
if
supplied
>
accepted
{
let
expected
=
if
required
<
accepted
{
"expected at most"
}
else
{
"expected"
};
span_err!
(
tcx
.sess
,
span
,
E0244
,
"wrong number of type arguments: {} {}, found {}"
,
expected
,
accepted
,
supplied
);
}
}
fn
report_lifetime_number_error
(
tcx
:
&
ty
::
ctxt
,
span
:
Span
,
number
:
usize
,
expected
:
usize
)
{
span_err!
(
tcx
.sess
,
span
,
E0107
,
"wrong number of lifetime parameters: expected {}, found {}"
,
expected
,
number
);
}
src/librustc_typeck/diagnostics.rs
浏览文件 @
7ff11d7b
...
...
@@ -172,7 +172,6 @@
E0248
,
// found value name used as a type
E0249
,
// expected constant expr for array length
E0250
,
// expected constant expr for array length
E0316
// wrong number of type arguments to a built-in trait
}
__
build_diagnostic_array!
{
DIAGNOSTICS
}
...
...
src/test/compile-fail/typeck-builtin-bound-type-parameters.rs
浏览文件 @
7ff11d7b
...
...
@@ -9,19 +9,20 @@
// except according to those terms.
fn
foo1
<
T
:
Copy
<
U
>
,
U
>
(
x
:
T
)
{}
//~^ ERROR:
builtin bounds do not require arguments, 1 given
//~^ ERROR:
wrong number of type arguments: expected 0, found 1
trait
Trait
:
Copy
<
Send
>
{}
//~^ ERROR:
builtin bounds do not require arguments, 1 given
//~^ ERROR:
wrong number of type arguments: expected 0, found 1
struct
MyStruct1
<
T
:
Copy
<
T
>>
;
//~^ ERROR
builtin bounds do not require arguments, 1 given
//~^ ERROR
wrong number of type arguments: expected 0, found 1
struct
MyStruct2
<
'a
,
T
:
Copy
<
'a
>>
;
//~^ ERROR:
builtin bounds do not require arguments, 1 given
//~^ ERROR:
wrong number of lifetime parameters: expected 0, found 1
fn
foo2
<
'a
,
T
:
Copy
<
'a
,
U
>
,
U
>
(
x
:
T
)
{}
//~^ ERROR builtin bounds do not require arguments, 2 given
//~^ ERROR: wrong number of type arguments: expected 0, found 1
//~^^ ERROR: wrong number of lifetime parameters: expected 0, found 1
fn
main
()
{
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录