---

pcwalton · pcwalton · commit 580eb1490ba2 · 2012-09-03T15:59:37.000-07:00
yaml --- r: 32350 b: refs/heads/dist-snap c: cd15eac h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 8f840f9ea0a60e05d3d587d64c9e178c0af1e227
+refs/heads/dist-snap: cd15eac9cf479feadffc546c05289f071601978a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/dist-snap/src/libcore/from_str.rs b/branches/dist-snap/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`	`+`