Use mk_sub_trait_refs

Author: fhahn

src/librustc/middle/typeck/check/mod.rs

@@ -112,7 +112,7 @@ use middle::lang_items::TypeIdLangItem;
 use util::common::{block_query, indenter, loop_query};
 use util::ppaux;
 use util::ppaux::{UserString, Repr};
-use util::nodemap::NodeMap;
+use util::nodemap::{NodeMap, FnvHashMap};
 use collections::{HashMap, HashSet};
 
 use std::cell::{Cell, RefCell};
@@ -871,19 +871,17 @@ fn compare_impl_method(tcx: ty::ctxt,
         for impl_bound in impl_param_def.bounds.trait_bounds.iter() {
             let mut specified = false;
             for trait_bound in trait_param_def.bounds.trait_bounds.iter() {
-                if !enforced_bounds.contains(&trait_bound.def_id) &&
-                        impl_bound.def_id == trait_bound.def_id {
-                    enforced_bounds.insert(trait_bound.def_id);
-                    specified = true;
-                    break
-                } else {
-                    for s_trait_bound in ty::trait_supertraits(tcx, trait_bound.def_id).iter() {
-                        if !enforced_bounds.contains(&trait_bound.def_id) &&
-                                impl_bound.def_id == s_trait_bound.def_id {
+                if !enforced_bounds.contains(&trait_bound.def_id) {
+                    match infer::mk_sub_trait_refs(&infcx,
+                                                   false,
+                                                   infer::RelateTraitRefs(impl_m_span),
+                                                   *impl_bound,
+                                                   *trait_bound) {
+                        result::Ok(()) => {
                             enforced_bounds.insert(trait_bound.def_id);
                             specified = true;
-                            break
-                        }
+                        } // Ok.
+                        result::Err(_) => {}
                     }
                 }
             }

src/test/compile-fail/typeck-trait-bounds-impl-comparison.rs

@@ -65,7 +65,17 @@ impl Foo for int {
     fn test_error8_fn<T: C>(&self) {}
     //~^ ERROR implementation bound `C` was not specified in trait definition
     //~^^ ERROR bound `B` not enforced by this implementation
+}
+
 
+trait Getter<T> { }
+
+trait Trait {
+    fn method<G:Getter<int>>();
 }
 
+impl Trait for uint {
+    fn method<G: Getter<uint>>() {}
+    //~^ ERROR requires Getter<uint> but Trait provides Getter<int>
+}
 fn main() {}

src/test/compile-fail/typeck-trait-bounds-impl-comparison2.rs

@@ -0,0 +1,23 @@
+// Copyright 2014 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.
+//
+// Make sure rustc checks the type parameter bounds in implementations of traits,
+// see #2687
+trait Getter<T> { }
+
+trait Trait {
+    fn method<G:Getter<int>>();
+}
+
+impl Trait for uint {
+    fn method<G: Getter<uint>>() {}
+    //~^ ERROR requires Getter<uint> but Trait provides Getter<int>
+}
+fn main() {}