Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
c3322556
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,发现更多精彩内容 >>
提交
c3322556
编写于
5月 19, 2018
作者:
F
F001
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix according to comments
上级
4bb39966
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
39 addition
and
21 deletion
+39
-21
src/librustc/lint/builtin.rs
src/librustc/lint/builtin.rs
+2
-2
src/librustc_lint/lib.rs
src/librustc_lint/lib.rs
+5
-0
src/librustc_typeck/astconv.rs
src/librustc_typeck/astconv.rs
+16
-12
src/test/ui/lint/issue-50589-multiple-associated-types.stderr
...test/ui/lint/issue-50589-multiple-associated-types.stderr
+16
-7
未找到文件。
src/librustc/lint/builtin.rs
浏览文件 @
c3322556
...
...
@@ -280,7 +280,7 @@
}
declare_lint!
{
pub
DUPLICATE_ASSOCIATED_TYPE_BINDING
,
pub
DUPLICATE_ASSOCIATED_TYPE_BINDING
S
,
Warn
,
"warns about duplicate associated type bindings in generics"
}
...
...
@@ -336,7 +336,7 @@ fn get_lints(&self) -> LintArray {
BARE_TRAIT_OBJECT
,
ABSOLUTE_PATH_NOT_STARTING_WITH_CRATE
,
UNSTABLE_NAME_COLLISION
,
DUPLICATE_ASSOCIATED_TYPE_BINDING
,
DUPLICATE_ASSOCIATED_TYPE_BINDING
S
,
)
}
}
...
...
src/librustc_lint/lib.rs
浏览文件 @
c3322556
...
...
@@ -283,6 +283,11 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
reference
:
"issue TBD"
,
edition
:
Some
(
Edition
::
Edition2018
),
},
FutureIncompatibleInfo
{
id
:
LintId
::
of
(
DUPLICATE_ASSOCIATED_TYPE_BINDINGS
),
reference
:
"issue #50589 <https://github.com/rust-lang/rust/issues/50589>"
,
edition
:
None
,
},
]);
// Register renamed and removed lints
...
...
src/librustc_typeck/astconv.rs
浏览文件 @
c3322556
...
...
@@ -406,16 +406,6 @@ pub(super) fn instantiate_poly_trait_ref_inner(&self,
trait_ref
.ref_id
,
poly_trait_ref
,
binding
,
speculative
,
&
mut
dup_bindings
);
predicate
.ok
()
// ok to ignore Err() because ErrorReported (see above)
}));
for
(
_
id
,
spans
)
in
dup_bindings
{
if
spans
.len
()
>
1
{
self
.tcx
()
.struct_span_lint_node
(
::
rustc
::
lint
::
builtin
::
DUPLICATE_ASSOCIATED_TYPE_BINDING
,
trait_ref
.ref_id
,
spans
,
"duplicate associated type binding"
)
.emit
();
}
}
debug!
(
"ast_path_to_poly_trait_ref({:?}, projections={:?}) -> {:?}"
,
trait_ref
,
poly_projections
,
poly_trait_ref
);
...
...
@@ -499,7 +489,7 @@ fn ast_type_binding_to_poly_projection_predicate(
trait_ref
:
ty
::
PolyTraitRef
<
'tcx
>
,
binding
:
&
ConvertedBinding
<
'tcx
>
,
speculative
:
bool
,
dup_bindings
:
&
mut
FxHashMap
<
DefId
,
Vec
<
Span
>
>
)
dup_bindings
:
&
mut
FxHashMap
<
DefId
,
Span
>
)
->
Result
<
ty
::
PolyProjectionPredicate
<
'tcx
>
,
ErrorReported
>
{
let
tcx
=
self
.tcx
();
...
...
@@ -577,7 +567,21 @@ fn ast_type_binding_to_poly_projection_predicate(
tcx
.sess
.span_err
(
binding
.span
,
&
msg
);
}
tcx
.check_stability
(
assoc_ty
.def_id
,
Some
(
ref_id
),
binding
.span
);
dup_bindings
.entry
(
assoc_ty
.def_id
)
.or_insert
(
Vec
::
new
())
.push
(
binding
.span
);
dup_bindings
.entry
(
assoc_ty
.def_id
)
.and_modify
(|
prev_span
|
{
let
mut
err
=
self
.tcx
()
.struct_span_lint_node
(
::
rustc
::
lint
::
builtin
::
DUPLICATE_ASSOCIATED_TYPE_BINDINGS
,
ref_id
,
binding
.span
,
&
format!
(
"associated type binding `{}` specified more than once"
,
binding
.item_name
)
);
err
.span_label
(
binding
.span
,
"used more than once"
);
err
.span_label
(
*
prev_span
,
format!
(
"first use of `{}`"
,
binding
.item_name
));
err
.emit
();
})
.or_insert
(
binding
.span
);
Ok
(
candidate
.map_bound
(|
trait_ref
|
{
ty
::
ProjectionPredicate
{
...
...
src/test/ui/lint/issue-50589-multiple-associated-types.stderr
浏览文件 @
c3322556
warning:
duplicate associated type binding
--> $DIR/issue-50589-multiple-associated-types.rs:17:
28
warning:
associated type binding `Item` specified more than once
--> $DIR/issue-50589-multiple-associated-types.rs:17:
39
|
LL | fn test() -> Box<Iterator<Item = (), Item = Unit>> {
| ^^^^^^^^^ ^^^^^^^^^^^
| --------- ^^^^^^^^^^^ used more than once
| |
| first use of `Item`
|
= note: #[warn(duplicate_associated_type_binding)] on by default
= note: #[warn(duplicate_associated_type_bindings)] on by default
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= note: for more information, see issue #50589 <https://github.com/rust-lang/rust/issues/50589>
warning:
duplicate associated type binding
--> $DIR/issue-50589-multiple-associated-types.rs:17:
28
warning:
associated type binding `Item` specified more than once
--> $DIR/issue-50589-multiple-associated-types.rs:17:
39
|
LL | fn test() -> Box<Iterator<Item = (), Item = Unit>> {
| ^^^^^^^^^ ^^^^^^^^^^^
| --------- ^^^^^^^^^^^ used more than once
| |
| first use of `Item`
|
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
= note: for more information, see issue #50589 <https://github.com/rust-lang/rust/issues/50589>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录