Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Vec::drain by a method that accepts a range parameter. #574

Merged
merged 4 commits into from
Mar 5, 2015
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 83 additions & 0 deletions text/0000-drain-range.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
- Start Date: 2015-01-12
- RFC PR #: (leave this empty)
- Rust Issue #: (leave this empty)

# Summary

Replace `Vec::drain` by a method that accepts a range parameter. Add
`String::drain` with similar functionality.

# Motivation

Allowing a range parameter is strictly more powerful than the current version.
E.g., see the following implementations of some `Vec` methods via the hypothetical
`drain_range` method:

```rust
fn truncate(x: &mut Vec<u8>, len: usize) {
if len <= x.len() {
x.drain_range(len..);
}
}

fn remove(x: &mut Vec<u8>, index: usize) -> u8 {
x.drain_range(index).next().unwrap()
}

fn pop(x: &mut Vec<u8>) -> Option<u8> {
match x.len() {
0 => None,
n => x.drain_range(n-1).next()
}
}

fn drain(x: &mut Vec<u8>) -> DrainRange<u8> {
x.drain_range(0..)
}

fn clear(x: &mut Vec<u8>) {
x.drain_range(0..);
}
```

With optimization enabled, those methods will produce code that runs as fast
as the current versions. (They should not be implemented this way.)

In particular, this method allows the user to remove a slice from a vector in
`O(Vec::len)` instead of `O(Slice::len * Vec::len)`.

# Detailed design

Remove `Vec::drain` and add the following method:

```rust
/// Creates a draining iterator that clears the specified range in the Vec and
/// iterates over the removed items from start to end.
///
/// # Panics
///
/// Panics if the range is decreasing or if the upper bound is larger than the
/// length of the vector.
pub fn drain<T: Drainer>(&mut self, range: T) -> RangeIter<T> {
range.drain(self)
}
```

Where `Drainer` should be implemented for `Range<usize>`, `RangeTo<usize>`,
`RangeFrom<usize>`, `FullRange`, and `usize`.

Add `String::drain`:

```rust
/// Creates a draining iterator that clears the specified range in the String
/// and iterates over the characters contained in the range.
///
/// # Panics
///
/// Panics if the range is decreasing, if the upper bound is larger than the
/// length of the String, or if the start and the end of the range don't lie on
/// character boundaries.
pub fn drain(&mut self, range: /* ? */) -> /* ? */ {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these omitted?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming that the return value can only be constructed inside the String module, these parts of the signature are merely an implementation detail. If you want to you can assume

pub fn drain<T: StringDrainer>(&mut self, range: T) -> CharRangeIter<T> {

or something similar.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The public signature doesn't seem like an implementation detail to me.

// ?
}
```