---

msullivan · msullivan · commit e4b41aa7203e · 2012-08-22T10:29:23.000-07:00
yaml --- r: 29975 b: refs/heads/incoming c: e94c542 h: refs/heads/master i: 29973: 865a5ff 29971: 5b38798 29967: e0bd85d v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 493117dcdad6ceb745bb4c4830533606928f05b2
+refs/heads/incoming: e94c5420f4081f1edae00ca83f642a992b754a15
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/incoming/src/libcore/char.rs b/branches/incoming/src/libcore/char.rs
@@ -107,7 +107,7 @@ pure fn is_digit(c: char) -> bool {
  *
  * # Safety note
  *
- * This function returns none if `c` is not a valid char
+ * This function fails if `c` is not a valid char
  *
  * # Return value
  *
diff --git a/branches/incoming/src/libstd/arena.rs b/branches/incoming/src/libstd/arena.rs
@@ -249,8 +249,7 @@ fn test_arena_destructors() {
     }
 }
 
-#[test]
-#[should_fail]
+#[test] #[should_fail] #[ignore(cfg(windows))]
 fn test_arena_destructors_fail() {
     let arena = arena::arena();
     // Put some stuff in the arena.

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ pure fn is_digit(c: char) -> bool {`
`107`	`107`	`*`
`108`	`108`	`* # Safety note`
`109`	`109`	`*`
`110`		- * This function returns none if `c` is not a valid char
	`110`	+ * This function fails if `c` is not a valid char
`111`	`111`	`*`
`112`	`112`	`* # Return value`
`113`	`113`	`*`
Original file line number	Diff line number	Diff line change
`@@ -249,8 +249,7 @@ fn test_arena_destructors() {`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
`252`		`-#[test]`
`253`		`-#[should_fail]`
	`252`	`+#[test] #[should_fail] #[ignore(cfg(windows))]`
`254`	`253`	`fn test_arena_destructors_fail() {`
`255`	`254`	`let arena = arena::arena();`
`256`	`255`	`// Put some stuff in the arena.`