---

bblum · bblum · commit 8aef4d630307 · 2012-07-03T21:03:51.000-04:00
yaml --- r: 24543 b: refs/heads/try2 c: aa909dc h: refs/heads/master i: 24541: 4bdcacc 24539: 5cc3b4c 24535: 7543aeb 24527: 5358239 24511: 5a437a0 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a76ed88f54f6e7a3f9a85936a7b4576e2e3f3e78
+refs/heads/try2: aa909dc60a172a6dd1b3788818364c0768b1ea84
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/src/libcore/option.rs b/branches/try2/src/libcore/option.rs
@@ -136,7 +136,7 @@ impl extensions<T: copy> for option<T> {
 
     Fails if the value equals `none`
     "]
-    pure fn expect<T: copy>(reason: str) -> T { expect(self, reason) }
+    pure fn expect(reason: str) -> T { expect(self, reason) }
 }
 
 #[test]
diff --git a/branches/try2/src/libstd/map.rs b/branches/try2/src/libstd/map.rs
@@ -232,11 +232,11 @@ mod chained {
         }
 
         fn get(k: K) -> V {
-            option::get(self.find(k))
+            self.find(k).expect("Key not found in table")
         }
 
         fn [](k: K) -> V {
-            option::get(self.find(k))
+            self.get(k)
         }
 
         fn remove(k: K) -> option<V> {

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ impl extensions<T: copy> for option<T> {`
`136`	`136`
`137`	`137`	Fails if the value equals `none`
`138`	`138`	`"]`
`139`		`- pure fn expect<T: copy>(reason: str) -> T { expect(self, reason) }`
	`139`	`+ pure fn expect(reason: str) -> T { expect(self, reason) }`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`#[test]`
Original file line number	Diff line number	Diff line change
`@@ -232,11 +232,11 @@ mod chained {`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`fn get(k: K) -> V {`
`235`		`- option::get(self.find(k))`
	`235`	`+ self.find(k).expect("Key not found in table")`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`fn [](k: K) -> V {`
`239`		`- option::get(self.find(k))`
	`239`	`+ self.get(k)`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`fn remove(k: K) -> option<V> {`