Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/librustc_typeck/coherence/inherent_impls_overlap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl<'a, 'tcx> InherentOverlapChecker<'a, 'tcx> {

let name_and_namespace = |def_id| {
let item = self.tcx.associated_item(def_id);
(item.ident, Namespace::from(item.kind))
(item.ident.modern(), Namespace::from(item.kind))
};

let impl_items1 = self.tcx.associated_item_def_ids(impl1);
Expand Down
23 changes: 23 additions & 0 deletions src/test/ui/specialization/specialization-overlap-hygiene.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#![feature(decl_macro)]

struct X;

macro_rules! define_f_legacy { () => {
fn f() {}
}}
macro define_g_modern() {
fn g() {}
}

impl X {
fn f() {} //~ ERROR duplicate definitions with name `f`
fn g() {} // OK
}
impl X {
define_f_legacy!();
}
impl X {
define_g_modern!();
}

fn main() {}
12 changes: 12 additions & 0 deletions src/test/ui/specialization/specialization-overlap-hygiene.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
error[E0592]: duplicate definitions with name `f`
--> $DIR/specialization-overlap-hygiene.rs:13:4
|
LL | fn f() {}
| --------- other definition for `f`
...
LL | fn f() {}
| ^^^^^^^^^ duplicate definitions for `f`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0592`.