diff options
| author | bors <bors@rust-lang.org> | 2015-01-14 04:42:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-14 04:42:01 +0000 |
| commit | 3614e1de6cf7abc7754c23f93476bef0e2625e99 (patch) | |
| tree | e36aa17f7450d9f0007d7278e244ba6d8127b5cf /src/libstd/rt | |
| parent | 170c4399e614fe599c3d41306b3429ca8b3b68c6 (diff) | |
| parent | c1d48a85082cfe3683ad9eda5223d3259d4fa718 (diff) | |
| download | rust-3614e1de6cf7abc7754c23f93476bef0e2625e99.tar.gz rust-3614e1de6cf7abc7754c23f93476bef0e2625e99.zip | |
auto merge of #21061 : japaric/rust/range, r=nick29581
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/unwind.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/util.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 6326e4c08f1..73b8f104c23 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -544,7 +544,7 @@ fn begin_unwind_inner(msg: Box<Any + Send>, file_line: &(&'static str, uint)) -> // MAX_CALLBACKS, so we're sure to clamp it as necessary. let callbacks = { let amt = CALLBACK_CNT.load(Ordering::SeqCst); - &CALLBACKS[0..cmp::min(amt, MAX_CALLBACKS)] + &CALLBACKS[..cmp::min(amt, MAX_CALLBACKS)] }; for cb in callbacks.iter() { match cb.load(Ordering::SeqCst) { diff --git a/src/libstd/rt/util.rs b/src/libstd/rt/util.rs index 83f646d89dc..235cedcda52 100644 --- a/src/libstd/rt/util.rs +++ b/src/libstd/rt/util.rs @@ -131,7 +131,7 @@ pub fn abort(args: fmt::Arguments) -> ! { impl<'a> fmt::Writer for BufWriter<'a> { fn write_str(&mut self, bytes: &str) -> fmt::Result { let left = self.buf.slice_from_mut(self.pos); - let to_write = &bytes.as_bytes()[0..cmp::min(bytes.len(), left.len())]; + let to_write = &bytes.as_bytes()[..cmp::min(bytes.len(), left.len())]; slice::bytes::copy_memory(left, to_write); self.pos += to_write.len(); Ok(()) @@ -142,7 +142,7 @@ pub fn abort(args: fmt::Arguments) -> ! { let mut msg = [0u8; 512]; let mut w = BufWriter { buf: &mut msg, pos: 0 }; let _ = write!(&mut w, "{}", args); - let msg = str::from_utf8(&w.buf[0..w.pos]).unwrap_or("aborted"); + let msg = str::from_utf8(&w.buf[..w.pos]).unwrap_or("aborted"); let msg = if msg.is_empty() {"aborted"} else {msg}; rterrln!("fatal runtime error: {}", msg); unsafe { intrinsics::abort(); } |
