---

killerswan · marijnh · commit 34e232f08a38 · 2012-02-23T17:00:19.000+01:00
yaml --- r: 11436 b: refs/heads/master c: e1d04e0 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7c78b7dfedb1f700e0fc3378fc3326bff86698f5
+refs/heads/master: e1d04e00621672a0e9f5424285f302077a973b37
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/libcore/str.rs b/trunk/src/libcore/str.rs
@@ -401,8 +401,8 @@ fn substr(s: str, begin: uint, len: uint) -> str {
 // beyond the last character of the string
 fn slice(ss: str, begin: uint, end: uint) -> str {
    alt maybe_slice(ss, begin, end) {
-      none     { fail "slice requires a valid start and end"; }
       some(sli) { ret sli; }
+      none      { fail "slice requires a valid start and end"; }
    }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -401,8 +401,8 @@ fn substr(s: str, begin: uint, len: uint) -> str {`
`401`	`401`	`// beyond the last character of the string`
`402`	`402`	`fn slice(ss: str, begin: uint, end: uint) -> str {`
`403`	`403`	`alt maybe_slice(ss, begin, end) {`
`404`		`- none { fail "slice requires a valid start and end"; }`
`405`	`404`	`some(sli) { ret sli; }`
	`405`	`+ none { fail "slice requires a valid start and end"; }`
`406`	`406`	`}`
`407`	`407`	`}`
`408`	`408`