Rollup merge of #41052 - topecongiro:overlapping_inherent_impls, r=estebank
Make 'overlapping_inherent_impls' lint a hard error This is ought to be implemented in PR #40728. Unfortunately, when I rebased the PR to resolve merge conflict, the "hard error" code disappeared. This PR complements the initial PR. Now the following rust code gives the following error: ```rust struct Foo; impl Foo { fn id() {} } impl Foo { fn id() {} } fn main() {} ``` ``` error[E0592]: duplicate definitions with name `id` --> /home/topecongiro/test.rs:4:5 | 4 | fn id() {} | ^^^^^^^^^^ duplicate definitions for `id` ... 8 | fn id() {} | ---------- other definition for `id` error: aborting due to previous error ```
This commit is contained in:
commit
a69fcfaecf
5 changed files with 53 additions and 11 deletions
|
@ -11,7 +11,6 @@
|
|||
use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
|
||||
use rustc::hir;
|
||||
use rustc::hir::itemlikevisit::ItemLikeVisitor;
|
||||
use rustc::lint;
|
||||
use rustc::traits::{self, Reveal};
|
||||
use rustc::ty::{self, TyCtxt};
|
||||
|
||||
|
@ -53,12 +52,16 @@ impl<'a, 'tcx> InherentOverlapChecker<'a, 'tcx> {
|
|||
|
||||
for &item2 in &impl_items2[..] {
|
||||
if (name, namespace) == name_and_namespace(item2) {
|
||||
let msg = format!("duplicate definitions with name `{}`", name);
|
||||
let node_id = self.tcx.hir.as_local_node_id(item1).unwrap();
|
||||
self.tcx.sess.add_lint(lint::builtin::OVERLAPPING_INHERENT_IMPLS,
|
||||
node_id,
|
||||
self.tcx.span_of_impl(item1).unwrap(),
|
||||
msg);
|
||||
struct_span_err!(self.tcx.sess,
|
||||
self.tcx.span_of_impl(item1).unwrap(),
|
||||
E0592,
|
||||
"duplicate definitions with name `{}`",
|
||||
name)
|
||||
.span_label(self.tcx.span_of_impl(item1).unwrap(),
|
||||
&format!("duplicate definitions for `{}`", name))
|
||||
.span_label(self.tcx.span_of_impl(item2).unwrap(),
|
||||
&format!("other definition for `{}`", name))
|
||||
.emit();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,6 +11,6 @@
|
|||
#![allow(dead_code)]
|
||||
|
||||
trait C {}
|
||||
impl C { fn f() {} } //~ ERROR duplicate definitions with name `f`
|
||||
impl C { fn f() {} }
|
||||
impl C { fn f() {} }
|
||||
fn main() { }
|
|
@ -0,0 +1,10 @@
|
|||
error[E0592]: duplicate definitions with name `f`
|
||||
--> $DIR/coherence-overlapping-inherent-impl-trait.rs:14:10
|
||||
|
|
||||
14 | impl C { fn f() {} }
|
||||
| ^^^^^^^^^ duplicate definitions for `f`
|
||||
15 | impl C { fn f() {} }
|
||||
| --------- other definition for `f`
|
||||
|
||||
error: aborting due to previous error
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
struct Foo;
|
||||
|
||||
impl Foo {
|
||||
fn id() {} //~ ERROR duplicate definitions
|
||||
fn id() {}
|
||||
}
|
||||
|
||||
impl Foo {
|
||||
|
@ -26,7 +26,7 @@ impl Foo {
|
|||
struct Bar<T>(T);
|
||||
|
||||
impl<T> Bar<T> {
|
||||
fn bar(&self) {} //~ ERROR duplicate definitions
|
||||
fn bar(&self) {}
|
||||
}
|
||||
|
||||
impl Bar<u32> {
|
||||
|
@ -36,7 +36,7 @@ impl Bar<u32> {
|
|||
struct Baz<T>(T);
|
||||
|
||||
impl<T: Copy> Baz<T> {
|
||||
fn baz(&self) {} //~ ERROR duplicate definitions
|
||||
fn baz(&self) {}
|
||||
}
|
||||
|
||||
impl<T> Baz<Vec<T>> {
|
29
src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
Normal file
29
src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
Normal file
|
@ -0,0 +1,29 @@
|
|||
error[E0592]: duplicate definitions with name `id`
|
||||
--> $DIR/overlapping_inherent_impls.rs:19:5
|
||||
|
|
||||
19 | fn id() {}
|
||||
| ^^^^^^^^^^ duplicate definitions for `id`
|
||||
...
|
||||
23 | fn id() {}
|
||||
| ---------- other definition for `id`
|
||||
|
||||
error[E0592]: duplicate definitions with name `bar`
|
||||
--> $DIR/overlapping_inherent_impls.rs:29:5
|
||||
|
|
||||
29 | fn bar(&self) {}
|
||||
| ^^^^^^^^^^^^^^^^ duplicate definitions for `bar`
|
||||
...
|
||||
33 | fn bar(&self) {}
|
||||
| ---------------- other definition for `bar`
|
||||
|
||||
error[E0592]: duplicate definitions with name `baz`
|
||||
--> $DIR/overlapping_inherent_impls.rs:39:5
|
||||
|
|
||||
39 | fn baz(&self) {}
|
||||
| ^^^^^^^^^^^^^^^^ duplicate definitions for `baz`
|
||||
...
|
||||
43 | fn baz(&self) {}
|
||||
| ---------------- other definition for `baz`
|
||||
|
||||
error: aborting due to 3 previous errors
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue