Skip to content

Commit f20cd95

Browse files
committed
---
yaml --- r: 36304 b: refs/heads/try2 c: f67904c h: refs/heads/master v: v3
1 parent c851148 commit f20cd95

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 187c6c90a14ec378ce502aa7f6f184ba28a71947
8+
refs/heads/try2: f67904ca407778be1adce893a90d2a8b292de40b
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,7 @@ pub pure fn to_str_bytes<U>(n: T, radix: uint, f: fn(v: &[u8]) -> U) -> U {
155155
/// Convert to a string
156156
pub pure fn str(i: T) -> ~str { return to_str(i, 10u); }
157157

158-
// FIXME: Has alignment issues on windows and 32-bit linux (#2609)
159158
#[test]
160-
#[ignore]
161159
fn test_from_str() {
162160
assert from_str(~"0") == Some(0 as T);
163161
assert from_str(~"3") == Some(3 as T);
@@ -175,9 +173,7 @@ fn test_from_str() {
175173
assert from_str(~"x").is_none();
176174
}
177175

178-
// FIXME: Has alignment issues on windows and 32-bit linux (#2609)
179176
#[test]
180-
#[ignore]
181177
fn test_parse_bytes() {
182178
use str::to_bytes;
183179
assert parse_bytes(to_bytes(~"123"), 10u) == Some(123 as T);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ pub fn test_to_str() {
221221
}
222222

223223
#[test]
224-
#[ignore]
225224
pub fn test_from_str() {
226225
assert from_str(~"0") == Some(0u as T);
227226
assert from_str(~"3") == Some(3u as T);
@@ -235,7 +234,6 @@ pub fn test_from_str() {
235234
}
236235

237236
#[test]
238-
#[ignore]
239237
pub fn test_parse_bytes() {
240238
use str::to_bytes;
241239
assert parse_bytes(to_bytes(~"123"), 10u) == Some(123u as T);

0 commit comments

Comments
 (0)