Skip to content

Commit df2b17d

Browse files
committed
---
yaml --- r: 138217 b: refs/heads/auto c: ce6226e h: refs/heads/master i: 138215: 046632a v: v3
1 parent d319684 commit df2b17d

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 3ef9aa01afd0fa825b751fa6c8878dc43e964529
16+
refs/heads/auto: ce6226e6c97a11933f09a9730458c6984e883bd7
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libnative/io/file_unix.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ mod tests {
523523
assert_eq!(buf[2], 's' as u8);
524524
assert_eq!(buf[3], 't' as u8);
525525
}
526-
r => fail!("invalid read: {:?}", r)
526+
r => fail!("invalid read: {}", r)
527527
}
528528

529529
assert!(writer.inner_read(buf).is_err());
@@ -547,7 +547,7 @@ mod tests {
547547
assert_eq!(buf[2], 's' as u8);
548548
assert_eq!(buf[3], 't' as u8);
549549
}
550-
r => fail!("invalid read: {:?}", r)
550+
r => fail!("invalid read: {}", r)
551551
}
552552
}
553553
}

branches/auto/src/librustrt/rtio.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ pub trait PausableIdleCallback {
356356

357357
pub trait RtioSignal {}
358358

359+
#[deriving(Show)]
359360
pub struct IoError {
360361
pub code: uint,
361362
pub extra: uint,

0 commit comments

Comments
 (0)