about summary refs log tree commit diff
path: root/src/test/run-pass
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-28 18:21:34 +0000
committerbors <bors@rust-lang.org>2014-06-28 18:21:34 +0000
commitde337f3ddfbef800a8cf731e0b593e341af1e3e5 (patch)
tree7f35eb443f0b58d81dc39f6d19da42bac4645d7e /src/test/run-pass
parentb47f2226a25654c5b781d27a91f2fa5274b3a347 (diff)
parent05e3248a7974f55b64f75a2483b37ff8c001a4ff (diff)
downloadrust-de337f3ddfbef800a8cf731e0b593e341af1e3e5.tar.gz
rust-de337f3ddfbef800a8cf731e0b593e341af1e3e5.zip
auto merge of #15191 : pcwalton/rust/variance-in-trait-matching, r=huonw
I believe that #5781 got fixed by the DST work. It duplicated the
variance inference work in #12828. Therefore, all that is left in #5781
is adding a test.

Closes #5781.

r? @huonw
Diffstat (limited to 'src/test/run-pass')
-rw-r--r--src/test/run-pass/trait-contravariant-self.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/test/run-pass/trait-contravariant-self.rs b/src/test/run-pass/trait-contravariant-self.rs
index d8df5d5600c..e06e01b9e05 100644
--- a/src/test/run-pass/trait-contravariant-self.rs
+++ b/src/test/run-pass/trait-contravariant-self.rs
@@ -1,3 +1,5 @@
+// ignore-test
+
 // 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.