---

pcwalton · pcwalton · commit e1249808210a · 2012-09-03T15:59:37.000-07:00
yaml --- r: 23688 b: refs/heads/master c: cd15eac h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8f840f9ea0a60e05d3d587d64c9e178c0af1e227
+refs/heads/master: cd15eac9cf479feadffc546c05289f071601978a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
diff --git a/trunk/src/libcore/from_str.rs b/trunk/src/libcore/from_str.rs
@@ -1,3 +1,6 @@
+use option::Option;
+
 trait FromStr {
     static fn from_str(s: &str) -> Option<self>;
 }
+

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+use option::Option;`
	`2`	`+`
`1`	`3`	`trait FromStr {`
`2`	`4`	`static fn from_str(s: &str) -> Option<self>;`
`3`	`5`	`}`
	`6`	`+`