Skip to content

Commit fab32b4

Browse files
committed
Now that the elaboration mechanism is suppressing defaults, we can remove this overeager code that was pruning out ambig where-clause matches in trait selection. cc rust-lang#21974.
1 parent 8d9bb17 commit fab32b4

File tree

2 files changed

+28
-19
lines changed

2 files changed

+28
-19
lines changed

src/librustc/middle/traits/select.rs

-19
Original file line numberDiff line numberDiff line change
@@ -1335,25 +1335,6 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
13351335
// the where clauses are in scope.
13361336
true
13371337
}
1338-
(&ParamCandidate(ref bound1), &ParamCandidate(ref bound2)) => {
1339-
self.infcx.probe(|_| {
1340-
let bound1 =
1341-
project::normalize_with_depth(self,
1342-
stack.obligation.cause.clone(),
1343-
stack.obligation.recursion_depth+1,
1344-
bound1);
1345-
let bound2 =
1346-
project::normalize_with_depth(self,
1347-
stack.obligation.cause.clone(),
1348-
stack.obligation.recursion_depth+1,
1349-
bound2);
1350-
let origin =
1351-
infer::RelateOutputImplTypes(stack.obligation.cause.span);
1352-
self.infcx
1353-
.sub_poly_trait_refs(false, origin, bound1.value, bound2.value)
1354-
.is_ok()
1355-
})
1356-
}
13571338
_ => {
13581339
false
13591340
}

src/test/compile-fail/issue-21974.rs

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// Test that (for now) we report an ambiguity error here, because
12+
// specific trait relationships are ignored for the purposes of trait
13+
// matching. This behavior should likely be improved such that this
14+
// test passes. See #21974 for more details.
15+
16+
trait Foo {
17+
fn foo(self);
18+
}
19+
20+
fn foo<'a,'b,T>(x: &'a T, y: &'b T)
21+
where &'a T : Foo,
22+
&'b T : Foo
23+
{
24+
x.foo(); //~ ERROR type annotations required
25+
y.foo();
26+
}
27+
28+
fn main() { }

0 commit comments

Comments
 (0)