1
Fork 0

Rollup test fixes and rebase conflicts

This commit is contained in:
Alex Crichton 2015-01-02 09:24:56 -08:00
parent 1f2ead1629
commit e921e3f045
31 changed files with 56 additions and 95 deletions

View file

@ -1119,10 +1119,6 @@ fn prefix_len(p: Option<PathPrefix>) -> uint {
#[cfg(test)]
mod tests {
use prelude::v1::Option::{mod, Some, None};
use prelude::v1::{Vec, Clone, AsSlice, SliceExt, CloneSliceExt, IteratorExt};
use prelude::v1::{DoubleEndedIteratorExt, Str, ToString, GenericPath};
use super::PathPrefix::*;
use super::parse_prefix;
use super::*;