bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into rollup

Browse source 
Conflicts:
	src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs
This commit is contained in:
Alex Crichton 2015-01-02 10:50:07 -08:00
commit 1f2ead1629
227 changed files with 383 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/run-pass/trait-inheritance-overloading.rs
View file

@ -13,7 +13,7 @@ use std::ops::{Add, Sub, Mul};
trait MyNum : Add<Self,Self> + Sub<Self,Self> + Mul<Self,Self> + PartialEq + Clone { }
#[deriving(Clone, Show)]
#[derive(Clone, Show)]
struct MyInt { val: int }
impl Add<MyInt, MyInt> for MyInt {