bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #11370 : alexcrichton/rust/issue-10465, r=pwalton

Browse source 
Turned out to be a 2-line fix, but the compiler fallout was huge.
This commit is contained in:
bors 2014-01-08 10:06:45 -08:00
commit 430652c970
90 changed files with 284 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libstd/vec.rs
View file

@ -611,6 +611,7 @@ impl<'a, T> RandomAccessIterator<&'a [T]> for ChunkIter<'a, T> {
pub mod traits {
use super::*;
use container::Container;
use clone::Clone;
use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Equiv};
use iter::order;
@ -2520,7 +2521,7 @@ pub unsafe fn from_buf<T>(ptr: *T, elts: uint) -> ~[T] {
pub mod raw {
use cast;
use ptr;
use vec::{with_capacity, MutableVector};
use vec::{with_capacity, MutableVector, OwnedVector};
use unstable::raw::Slice;
/**
@ -2599,8 +2600,9 @@ pub mod raw {
/// Operations on `[u8]`.
pub mod bytes {
use container::Container;
use vec::MutableVector;
use vec::{MutableVector, OwnedVector, ImmutableVector};
use ptr;
use ptr::RawPtr;
/// A trait for operations on mutable `[u8]`s.
pub trait MutableByteVector {
@ -2968,10 +2970,10 @@ impl<A> Extendable<A> for ~[A] {
#[cfg(test)]
mod tests {
use prelude::*;
use mem;
use vec::*;
use cmp::*;
use prelude::*;
use rand::{Rng, task_rng};
fn square(n: uint) -> uint { n * n }
@ -4452,13 +4454,11 @@ mod tests {
#[cfg(test)]
mod bench {
use extra::test::BenchHarness;
use iter::range;
use vec;
use vec::{VectorVector, MutableTotalOrdVector};
use option::*;
use mem;
use prelude::*;
use ptr;
use rand::{weak_rng, Rng};
use mem;
use vec;
#[bench]
fn iterator(bh: &mut BenchHarness) {