mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Borrow bound from SliceExt::binary_search

Browse Source
This commit is contained in:
Chris Stankus 2017-08-18 12:20:04 -05:00
parent ca9cf3594a
commit e15a07ad64
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libcore/slice/mod.rs
View File

@ -35,7 +35,6 @@
// * The `raw` and `bytes` submodules. // * The `raw` and `bytes` submodules.
// * Boilerplate trait implementations. // * Boilerplate trait implementations.
use borrow::Borrow;
use cmp::Ordering::{self, Less, Equal, Greater}; use cmp::Ordering::{self, Less, Equal, Greater};
use cmp; use cmp;
use fmt; use fmt;
@ -122,19 +121,17 @@ pub trait SliceExt {
fn as_ptr(&self) -> *const Self::Item; fn as_ptr(&self) -> *const Self::Item;
#[stable(feature = "core", since = "1.6.0")] #[stable(feature = "core", since = "1.6.0")]
fn binary_search<Q: ?Sized>(&self, x: &Q) -> Result<usize, usize> fn binary_search(&self, x: &Self::Item) -> Result<usize, usize>
where Self::Item: Borrow<Q>, where Self::Item: Ord;
Q: Ord;
#[stable(feature = "core", since = "1.6.0")] #[stable(feature = "core", since = "1.6.0")]
fn binary_search_by<'a, F>(&'a self, f: F) -> Result<usize, usize> fn binary_search_by<'a, F>(&'a self, f: F) -> Result<usize, usize>
where F: FnMut(&'a Self::Item) -> Ordering; where F: FnMut(&'a Self::Item) -> Ordering;
#[stable(feature = "slice_binary_search_by_key", since = "1.10.0")] #[stable(feature = "slice_binary_search_by_key", since = "1.10.0")]
fn binary_search_by_key<'a, B, F, Q: ?Sized>(&'a self, b: &Q, f: F) -> Result<usize, usize> fn binary_search_by_key<'a, B, F>(&'a self, b: &B, f: F) -> Result<usize, usize>
where F: FnMut(&'a Self::Item) -> B, where F: FnMut(&'a Self::Item) -> B,
B: Borrow<Q>, B: Ord;
Q: Ord;
#[stable(feature = "core", since = "1.6.0")] #[stable(feature = "core", since = "1.6.0")]
fn len(&self) -> usize; fn len(&self) -> usize;
@ -635,11 +632,10 @@ impl<T> SliceExt for [T] {
m >= n && needle == &self[m-n..] m >= n && needle == &self[m-n..]
} }
fn binary_search<Q: ?Sized>(&self, x: &Q) -> Result<usize, usize> fn binary_search(&self, x: &T) -> Result<usize, usize>
where T: Borrow<Q>, where T: Ord
Q: Ord
{ {
self.binary_search_by(|p| p.borrow().cmp(x)) self.binary_search_by(|p| p.cmp(x))
} }
fn rotate(&mut self, mid: usize) { fn rotate(&mut self, mid: usize) {
@ -687,12 +683,11 @@ impl<T> SliceExt for [T] {
} }
#[inline] #[inline]
fn binary_search_by_key<'a, B, F, Q: ?Sized>(&'a self, b: &Q, mut f: F) -> Result<usize, usize> fn binary_search_by_key<'a, B, F>(&'a self, b: &B, mut f: F) -> Result<usize, usize>
where F: FnMut(&'a Self::Item) -> B, where F: FnMut(&'a Self::Item) -> B,
B: Borrow<Q>, B: Ord
Q: Ord
{ {
self.binary_search_by(|k| f(k).borrow().cmp(b)) self.binary_search_by(|k| f(k).cmp(b))
} }
#[inline] #[inline]