---

catamorphism · catamorphism · commit e943c4883762 · 2012-12-14T15:25:32.000-08:00
yaml --- r: 40823 b: refs/heads/dist-snap c: 3a5b6a7 h: refs/heads/master i: 40821: 58e156e 40819: 50bc138 40815: 3e9a63e v: v3
diff --git a/[refs] b/[refs]
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 0b3cc15a00bf94b0a00d6f746cf316408817d944
+refs/heads/dist-snap: 3a5b6a79c662e4d851cdf0da3f571dca10e1d21a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/test/auxiliary/trait_inheritance_overloading_xc.rs b/branches/dist-snap/src/test/auxiliary/trait_inheritance_overloading_xc.rs
@@ -10,7 +10,7 @@
 
 use cmp::Eq;
 
-pub trait MyNum : Add<self,self>, Sub<self,self>, Mul<self,self>, Eq {
+pub trait MyNum : Add<self,self> Sub<self,self> Mul<self,self> Eq {
 }
 
 pub struct MyInt {
diff --git a/branches/dist-snap/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs b/branches/dist-snap/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test
 // xfail-fast - check-fast doesn't understand aux-build
 // aux-build:trait_inheritance_overloading_xc.rs
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`use cmp::Eq;`
`12`	`12`
`13`		`-pub trait MyNum : Add<self,self>, Sub<self,self>, Mul<self,self>, Eq {`
	`13`	`+pub trait MyNum : Add<self,self> Sub<self,self> Mul<self,self> Eq {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`pub struct MyInt {`