---

yaml
---
r: 38969
b: refs/heads/incoming
c: f67904c
h: refs/heads/master
i:
  38967: 54f657c
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 187c6c90a14ec378ce502aa7f6f184ba28a71947
+refs/heads/incoming: f67904ca407778be1adce893a90d2a8b292de40b
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/int-template.rs

@@ -155,9 +155,7 @@ pub pure fn to_str_bytes<U>(n: T, radix: uint, f: fn(v: &[u8]) -> U) -> U {
 /// Convert to a string
 pub pure fn str(i: T) -> ~str { return to_str(i, 10u); }
 
-// FIXME: Has alignment issues on windows and 32-bit linux (#2609)
 #[test]
-#[ignore]
 fn test_from_str() {
     assert from_str(~"0") == Some(0 as T);
     assert from_str(~"3") == Some(3 as T);
@@ -175,9 +173,7 @@ fn test_from_str() {
     assert from_str(~"x").is_none();
 }
 
-// FIXME: Has alignment issues on windows and 32-bit linux (#2609)
 #[test]
-#[ignore]
 fn test_parse_bytes() {
     use str::to_bytes;
     assert parse_bytes(to_bytes(~"123"), 10u) == Some(123 as T);

branches/incoming/src/libcore/uint-template.rs

@@ -221,7 +221,6 @@ pub fn test_to_str() {
 }
 
 #[test]
-#[ignore]
 pub fn test_from_str() {
     assert from_str(~"0") == Some(0u as T);
     assert from_str(~"3") == Some(3u as T);
@@ -235,7 +234,6 @@ pub fn test_from_str() {
 }
 
 #[test]
-#[ignore]
 pub fn test_parse_bytes() {
     use str::to_bytes;
     assert parse_bytes(to_bytes(~"123"), 10u) == Some(123u as T);