mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add tests for duplicate methods on traits/impls.

Browse Source
This commit is contained in:
Luqman Aden 2013-06-11 15:08:40 -04:00 committed by Luqman Aden
parent c6f3103006
commit 47772bcb73
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc/middle/resolve.rs
View File

@ -1238,10 +1238,10 @@ impl Resolver {
let old_sp = methods_seen.find_or_insert(ident, span);
if *old_sp != span {
self.session.span_err(span,
fmt!("duplicate definition of method %s",
fmt!("duplicate definition of method `%s`",
*self.session.str_of(ident)));
self.session.span_note(*old_sp,
fmt!("first definition of method %s here",
fmt!("first definition of method `%s` here",
*self.session.str_of(ident)));
}
}
@ -1375,10 +1375,10 @@ impl Resolver {
let old_sp = method_names.find_or_insert(ident, ty_m.span);
if *old_sp != ty_m.span {
self.session.span_err(ty_m.span,
fmt!("duplicate definition of method %s",
fmt!("duplicate definition of method `%s`",
*self.session.str_of(ident)));
self.session.span_note(*old_sp,
fmt!("first definition of method %s here",
fmt!("first definition of method `%s` here",
*self.session.str_of(ident)));
}
}

17
src/test/compile-fail/impl-duplicate-methods.rs Normal file
View File

@ -0,0 +1,17 @@
// Copyright 2013 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.
struct Foo;
impl Foo {
fn orange(&self){}
fn orange(&self){} //~ ERROR error: duplicate definition of method `orange`
}
fn main() {}

16
src/test/compile-fail/trait-duplicate-methods.rs Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2013 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.
trait Foo {
fn orange(&self);
fn orange(&self); //~ ERROR error: duplicate definition of method `orange`
}
fn main() {}