---

yaml
---
r: 106057
b: refs/heads/auto
c: 1607871
h: refs/heads/master
i:
  106055: 8af08d1
v: v3

Author: emberian

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1f4c63049ed2e323ba2961c19dc067f86dd61861
+refs/heads/auto: 1607871dc2a5240177865210822238f66c1dfb2e
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/typeck/collect.rs

@@ -48,6 +48,8 @@ use util::ppaux::Repr;
 use std::rc::Rc;
 use std::vec_ng::Vec;
 use std::vec_ng;
+use collections::HashSet;
+
 use syntax::abi::AbiSet;
 use syntax::ast::{RegionTyParamBound, TraitTyParamBound};
 use syntax::ast;
@@ -478,7 +480,12 @@ fn convert_methods(ccx: &CrateCtxt,
                    rcvr_visibility: ast::Visibility)
 {
     let tcx = ccx.tcx;
+    let mut seen_methods = HashSet::new();
     for m in ms.iter() {
+        if !seen_methods.insert(m.ident.repr(ccx.tcx)) {
+            tcx.sess.span_err(m.span, "duplicate method in trait impl");
+        }
+
         let num_rcvr_ty_params = rcvr_ty_generics.type_param_defs().len();
         let m_ty_generics = ty_generics_for_fn_or_method(ccx, &m.generics,
                                                          num_rcvr_ty_params);

branches/auto/src/test/compile-fail/issue-8153.rs

@@ -0,0 +1,26 @@
+// 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.
+
+// Test that duplicate methods in impls are not allowed
+
+struct Foo;
+
+trait Bar {
+    fn bar(&self) -> int;
+}
+
+impl Bar for Foo {
+    fn bar(&self) -> int {1}
+    fn bar(&self) -> int {2} //~ ERROR duplicate method
+}
+
+fn main() {
+    println!("{}", Foo.bar());
+}