about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-07-16 21:31:48 -0700
committerbors <bors@rust-lang.org>2013-07-16 21:31:48 -0700
commit4bd716ac8eb60dbaced9e3d2bafee89b713a7849 (patch)
tree0e4b5bfa54cd0ada0c34029e3ab59eb7c50f5fc3 /src/libsyntax/parse
parent8a1002fbd93989bbf5c8989ed8002827920b375b (diff)
parent712ac836c63c3ae98daf9fb98b7b96ed73347848 (diff)
downloadrust-4bd716ac8eb60dbaced9e3d2bafee89b713a7849.tar.gz
rust-4bd716ac8eb60dbaced9e3d2bafee89b713a7849.zip
auto merge of #7831 : ozten/rust/issues-7764-swap_unwarp-take-unwrap, r=pcwalton
Fixes Issue #7764

Running `make check` I do get a failure:

    test rt::io::extensions::test::push_bytes ... ok
    rustest rt::comm::test::oneshot_single_thread_send_port_close ... t: task failed at 'Unhandled condition:
     read_error: {kind: OtherIoError, desc: "Placeholder error. You shouldn\'t be seeing this", detail: None}',
     /Users/shout/Projects/rust/src/libstd/condition.rs:50
    /bin/sh: line 1: 35056 Abort trap: 6           x86_64-apple-darwin/stage2/test/stdtest-x86_64-apple-darwin --logfile
     tmp/check-stage2-T-x86_64-apple-darwin-H-x86_64-apple-darwin-std.log
    make: *** [tmp/check-stage2-T-x86_64-apple-darwin-H-x86_64-apple-darwin-std.ok] Error 134
Diffstat (limited to 'src/libsyntax/parse')
0 files changed, 0 insertions, 0 deletions