diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 11:53:49 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-21 11:53:49 -0800 |
| commit | 886c6f3534e6f03916eeff2ea8b235e85dd04b42 (patch) | |
| tree | 616ec48db83b768a4be84225bed9b0c0f730072d /src/libstd/sys/unix | |
| parent | 036d8c41897099b5822eafa40e3f1fd2cdc4a92a (diff) | |
| parent | 537889aa78c984ee6484d16fec4a67f35778aec6 (diff) | |
| download | rust-886c6f3534e6f03916eeff2ea8b235e85dd04b42.tar.gz rust-886c6f3534e6f03916eeff2ea8b235e85dd04b42.zip | |
rollup merge of #21258: aturon/stab-3-index
Conflicts: src/libcore/ops.rs src/librustc_typeck/astconv.rs src/libstd/io/mem.rs src/libsyntax/parse/lexer/mod.rs
Diffstat (limited to 'src/libstd/sys/unix')
| -rw-r--r-- | src/libstd/sys/unix/process.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs index 0eab27de43a..2b4d168d881 100644 --- a/src/libstd/sys/unix/process.rs +++ b/src/libstd/sys/unix/process.rs @@ -125,9 +125,9 @@ impl Process { let mut bytes = [0; 8]; return match input.read(&mut bytes) { Ok(8) => { - assert!(combine(CLOEXEC_MSG_FOOTER) == combine(bytes.slice(4, 8)), + assert!(combine(CLOEXEC_MSG_FOOTER) == combine(&bytes[4.. 8]), "Validation on the CLOEXEC pipe failed: {:?}", bytes); - let errno = combine(bytes.slice(0, 4)); + let errno = combine(&bytes[0.. 4]); assert!(p.wait(0).is_ok(), "wait(0) should either return Ok or panic"); Err(super::decode_error(errno)) } |
