Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
41487111
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
41487111
编写于
2月 13, 2017
作者:
C
Corey Farwell
提交者:
GitHub
2月 13, 2017
浏览文件
操作
浏览文件
下载
差异文件
Rollup merge of #39758 - shepmaster:e0089-duplicate-text, r=GuillaumeGomez
Remove duplicated "parameter" in E0089 text Closes #39732
上级
5b79f33c
1c998416
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
44 addition
and
36 deletion
+44
-36
src/librustc_typeck/check/mod.rs
src/librustc_typeck/check/mod.rs
+25
-23
src/test/compile-fail/E0087.rs
src/test/compile-fail/E0087.rs
+7
-3
src/test/compile-fail/E0088.rs
src/test/compile-fail/E0088.rs
+6
-4
src/test/compile-fail/E0089.rs
src/test/compile-fail/E0089.rs
+2
-3
src/test/compile-fail/E0090.rs
src/test/compile-fail/E0090.rs
+3
-2
src/test/compile-fail/ufcs-qpath-missing-params.rs
src/test/compile-fail/ufcs-qpath-missing-params.rs
+1
-1
未找到文件。
src/librustc_typeck/check/mod.rs
浏览文件 @
41487111
...
...
@@ -4510,28 +4510,32 @@ fn check_path_parameter_count(&self,
}
};
let
count
=
|
n
|
{
format!
(
"{} parameter{}"
,
n
,
if
n
==
1
{
""
}
else
{
"s"
})
let
count_lifetime_params
=
|
n
|
{
format!
(
"{} lifetime parameter{}"
,
n
,
if
n
==
1
{
""
}
else
{
"s"
})
};
let
count_type_params
=
|
n
|
{
format!
(
"{} type parameter{}"
,
n
,
if
n
==
1
{
""
}
else
{
"s"
})
};
// Check provided lifetime parameters.
let
lifetime_defs
=
segment
.map_or
(
&
[][
..
],
|(
_
,
generics
)|
&
generics
.regions
);
if
lifetimes
.len
()
>
lifetime_defs
.len
()
{
let
expected_text
=
count_lifetime_params
(
lifetime_defs
.len
());
let
actual_text
=
count_lifetime_params
(
lifetimes
.len
());
struct_span_err!
(
self
.tcx.sess
,
span
,
E0088
,
"too many lifetime parameters provided:
\
expected {}, found {}"
,
count
(
lifetime_defs
.len
()),
count
(
lifetimes
.len
()))
.span_label
(
span
,
&
format!
(
"unexpected lifetime parameter{}"
,
match
lifetimes
.len
()
{
1
=>
""
,
_
=>
"s"
}))
expected at most {}, found {}"
,
expected_text
,
actual_text
)
.span_label
(
span
,
&
format!
(
"expected {}"
,
expected_text
))
.emit
();
}
else
if
lifetimes
.len
()
>
0
&&
lifetimes
.len
()
<
lifetime_defs
.len
()
{
let
expected_text
=
count_lifetime_params
(
lifetime_defs
.len
());
let
actual_text
=
count_lifetime_params
(
lifetimes
.len
());
struct_span_err!
(
self
.tcx.sess
,
span
,
E0090
,
"too few lifetime parameters provided:
\
expected {}, found {}"
,
count
(
lifetime_defs
.len
()),
count
(
lifetimes
.len
()))
.span_label
(
span
,
&
format!
(
"too few lifetime parameters"
))
expected {}, found {}"
,
expected_text
,
actual_text
)
.span_label
(
span
,
&
format!
(
"expected {}"
,
expected_text
))
.emit
();
}
...
...
@@ -4552,29 +4556,27 @@ fn check_path_parameter_count(&self,
.count
();
if
types
.len
()
>
type_defs
.len
()
{
let
span
=
types
[
type_defs
.len
()]
.span
;
let
expected_text
=
count_type_params
(
type_defs
.len
());
let
actual_text
=
count_type_params
(
types
.len
());
struct_span_err!
(
self
.tcx.sess
,
span
,
E0087
,
"too many type parameters provided:
\
expected at most {}, found {}"
,
count
(
type_defs
.len
()),
count
(
types
.len
()
))
.
span_label
(
span
,
&
format!
(
"too many type parameters"
))
.
emit
();
expected_text
,
actual_text
)
.span_label
(
span
,
&
format!
(
"expected {}"
,
expected_text
))
.emit
();
// To prevent derived errors to accumulate due to extra
// type parameters, we force instantiate_value_path to
// use inference variables instead of the provided types.
*
segment
=
None
;
}
else
if
!
infer_types
&&
types
.len
()
<
required_len
{
let
adjust
=
|
len
|
if
len
>
1
{
"parameters"
}
else
{
"parameter"
};
let
required_param_str
=
adjust
(
required_len
);
let
actual_param_str
=
adjust
(
types
.len
());
let
expected_text
=
count_type_params
(
required_len
);
let
actual_text
=
count_type_params
(
types
.len
());
struct_span_err!
(
self
.tcx.sess
,
span
,
E0089
,
"too few type parameters provided:
\
expected {} {}, found {} {}"
,
count
(
required_len
),
required_param_str
,
count
(
types
.len
()),
actual_param_str
)
.span_label
(
span
,
&
format!
(
"expected {} type {}"
,
required_len
,
required_param_str
))
expected {}, found {}"
,
expected_text
,
actual_text
)
.span_label
(
span
,
&
format!
(
"expected {}"
,
expected_text
))
.emit
();
}
...
...
src/test/compile-fail/E0087.rs
浏览文件 @
41487111
...
...
@@ -8,9 +8,13 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
fn
foo
<
T
>
()
{}
fn
foo
()
{}
fn
bar
<
T
>
()
{}
fn
main
()
{
foo
::
<
f64
,
bool
>
();
//~ ERROR E0087
//~^ NOTE too many type parameters
foo
::
<
f64
>
();
//~ ERROR expected at most 0 type parameters, found 1 type parameter [E0087]
//~^ NOTE expected 0 type parameters
bar
::
<
f64
,
u64
>
();
//~ ERROR expected at most 1 type parameter, found 2 type parameters [E0087]
//~^ NOTE expected 1 type parameter
}
src/test/compile-fail/E0088.rs
浏览文件 @
41487111
...
...
@@ -12,9 +12,11 @@ fn f() {}
fn
g
<
'a
>
()
{}
fn
main
()
{
f
::
<
'static
>
();
//~ ERROR E0088
//~^ unexpected lifetime parameter
f
::
<
'static
>
();
//~^ ERROR expected at most 0 lifetime parameters, found 1 lifetime parameter [E0088]
//~| NOTE expected 0 lifetime parameters
g
::
<
'static
,
'static
>
();
//~ ERROR E0088
//~^ unexpected lifetime parameters
g
::
<
'static
,
'static
>
();
//~^ ERROR expected at most 0 lifetime parameters, found 2 lifetime parameters [E0088]
//~| NOTE expected 0 lifetime parameters
}
src/test/compile-fail/E0089.rs
浏览文件 @
41487111
...
...
@@ -11,7 +11,6 @@
fn
foo
<
T
,
U
>
()
{}
fn
main
()
{
foo
::
<
f64
>
();
//~^ ERROR E0089
//~| NOTE expected 2 type parameters
foo
::
<
f64
>
();
//~ ERROR expected 2 type parameters, found 1 type parameter [E0089]
//~| NOTE expected 2 type parameters
}
src/test/compile-fail/E0090.rs
浏览文件 @
41487111
...
...
@@ -9,7 +9,8 @@
// except according to those terms.
fn
foo
<
'a
:
'b
,
'b
:
'a
>
()
{}
fn
main
()
{
foo
::
<
'static
>
();
//~ ERROR E0090
//~^ too few
lifetime parameters
foo
::
<
'static
>
();
//~ ERROR expected 2 lifetime parameters, found 1 lifetime parameter [E0090]
//~^ NOTE expected 2
lifetime parameters
}
src/test/compile-fail/ufcs-qpath-missing-params.rs
浏览文件 @
41487111
...
...
@@ -22,5 +22,5 @@ fn into_cow(self) -> Cow<'a, str> {
fn
main
()
{
<
String
as
IntoCow
>
::
into_cow
(
"foo"
.to_string
());
//~^ ERROR too few type parameters provided: expected 1 parameter
//~^ ERROR too few type parameters provided: expected 1
type
parameter
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录