---

graydon · graydon · commit 907921a7028b · 2012-11-13T11:16:19.000-08:00
yaml --- r: 38933 b: refs/heads/incoming c: d2f93fd h: refs/heads/master i: 38931: 5cfbb16 v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: ac0fd0ddc9bc795b30dc4ecaaf1c01b5eebdfd4b
+refs/heads/incoming: d2f93fd290f6ab7cd1b0b0af78487c25aec0db89
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/librustc/middle/trans/deriving.rs b/branches/incoming/src/librustc/middle/trans/deriving.rs
@@ -23,8 +23,8 @@ use syntax::ast_util::local_def;
 
 /// The kind of deriving method this is.
 enum DerivingKind {
-	BoolKind,	// fn f(&self, other: &other) -> bool
-	UnitKind,	// fn f(&self) -> ()
+    BoolKind,	// fn f(&self, other: &other) -> bool
+    UnitKind,	// fn f(&self) -> ()
 }
 
 impl DerivingKind {

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ use syntax::ast_util::local_def;`
`23`	`23`
`24`	`24`	`/// The kind of deriving method this is.`
`25`	`25`	`enum DerivingKind {`
`26`		`- BoolKind, // fn f(&self, other: &other) -> bool`
`27`		`- UnitKind, // fn f(&self) -> ()`
	`26`	`+ BoolKind, // fn f(&self, other: &other) -> bool`
	`27`	`+ UnitKind, // fn f(&self) -> ()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`impl DerivingKind {`