Skip to content

Commit 8490498

Browse files
committed
---
yaml --- r: 61295 b: refs/heads/try c: 272c3c2 h: refs/heads/master i: 61293: 0e6a6aa 61291: 85f5eb8 61287: 00b2497 61279: 0478fe4 v: v3
1 parent 8de489a commit 8490498

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
5-
refs/heads/try: 10355d7a7d1ba87d49149e5fcdc5d3955932afe2
5+
refs/heads/try: 272c3c2cfb1008ffc4437599ce94aad59e0b72b7
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/logging.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ pub fn log_type<T>(level: u32, object: &T) {
6464
}
6565

6666
fn newsched_log_str(msg: ~str) {
67-
6867
unsafe {
6968
match rt::local_services::unsafe_try_borrow_local_services() {
7069
Some(local) => {

branches/try/src/libcore/rt/io/net/tcp.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl Reader for TcpStream {
5656
match bytes_read {
5757
Ok(read) => Some(read),
5858
Err(_) => {
59-
abort!("TODO");
59+
abort!("XXX");
6060
}
6161
}
6262
}
@@ -70,7 +70,7 @@ impl Writer for TcpStream {
7070
match res {
7171
Ok(_) => (),
7272
Err(_) => {
73-
abort!("TODO");
73+
abort!("XXX");
7474
}
7575
}
7676
}
@@ -107,7 +107,7 @@ impl Listener<TcpStream> for TcpListener {
107107
Some(TcpStream::new(s))
108108
}
109109
Err(_) => {
110-
abort!("TODO");
110+
abort!("XXX");
111111
}
112112
}
113113
}

branches/try/src/libcore/rt/local_sched.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pub fn borrow(f: &fn(&mut Scheduler)) {
6363
unsafe {
6464
let unsafe_sched = cast::transmute_mut_region(&mut *sched);
6565
let sched = Cell(sched);
66-
66+
6767
do (|| {
6868
f(unsafe_sched);
6969
}).finally {

0 commit comments

Comments
 (0)