user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #41052 - topecongiro:overlapping_inherent_impls, r=estebank

Browse source 
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:
Ariel Ben-Yehuda 2017-04-05 23:01:11 +00:00 • committed by GitHub
commit a69fcfaecf
5 changed files with 53 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/test/compile-fail/coherence-overlapping-inherent-impl-trait.rs
View file

@ -1,16 +0,0 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![allow(dead_code)]
trait C {}
impl C { fn f() {} } //~ ERROR duplicate definitions with name `f`
impl C { fn f() {} }
fn main() { }

46
src/test/compile-fail/inherent-overlap.rs
View file

@ -1,46 +0,0 @@
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// Test that you cannot define items with the same name in overlapping inherent
// impl blocks.
#![allow(unused)]
struct Foo;
impl Foo {
fn id() {} //~ ERROR duplicate definitions
}
impl Foo {
fn id() {}
}
struct Bar<T>(T);
impl<T> Bar<T> {
fn bar(&self) {} //~ ERROR duplicate definitions
}
impl Bar<u32> {
fn bar(&self) {}
}
struct Baz<T>(T);
impl<T: Copy> Baz<T> {
fn baz(&self) {} //~ ERROR duplicate definitions
}
impl<T> Baz<Vec<T>> {
fn baz(&self) {}
}
fn main() {}