diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-02-11 17:24:45 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-02-11 17:24:45 -0700 |
| commit | 2cc08f289ab909de44fa09a07b2c43b70ce379b9 (patch) | |
| tree | 0c243afe9d7d82695d16bd43d72e88600e4414ef /components/util/vec.rs | |
| parent | bc6882bdefc318402a46ede1494eb79339705c21 (diff) | |
| parent | d5dd1d658e5d79701fb9d028479a0fcb26a033fa (diff) | |
| download | servo-2cc08f289ab909de44fa09a07b2c43b70ce379b9.tar.gz servo-2cc08f289ab909de44fa09a07b2c43b70ce379b9.zip | |
auto merge of #4893 : servo/servo/rustup_2015-01-31, r=Ms2ger,glennw
Ready for review.
Final link step on android fails, but we know how to fix it and will add it to this branch soon.
Diffstat (limited to 'components/util/vec.rs')
| -rw-r--r-- | components/util/vec.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/util/vec.rs b/components/util/vec.rs index a902a3133df..f612726d129 100644 --- a/components/util/vec.rs +++ b/components/util/vec.rs @@ -5,7 +5,7 @@ use std::cmp::{PartialOrd, PartialEq, Ordering}; #[cfg(test)] -use std::fmt::Show; +use std::fmt::Debug; /// FIXME(pcwalton): Workaround for lack of unboxed closures. This is called in /// performance-critical code, so a closure is insufficient. @@ -74,7 +74,7 @@ fn test_find_all_elems<T: PartialEq + PartialOrd + Eq + Ord>(arr: &[T]) { } #[cfg(test)] -fn test_miss_all_elems<T: PartialEq + PartialOrd + Eq + Ord + Show>(arr: &[T], misses: &[T]) { +fn test_miss_all_elems<T: PartialEq + PartialOrd + Eq + Ord + Debug>(arr: &[T], misses: &[T]) { let mut i = 0; while i < misses.len() { let res = arr.binary_search_(&misses[i]); |