Skip to content

Commit 2a35605

Browse files
committed
---
yaml --- r: 127981 b: refs/heads/auto c: c3b9d5d h: refs/heads/master i: 127979: ad15905 v: v3
1 parent f35f092 commit 2a35605

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: bc450b17e3bfe1c195f8f286a3228cca1f706a74
16+
refs/heads/auto: c3b9d5df6250ef021acf993576d52dd7a29a6bba
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcore/slice.rs

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use ptr::RawPtr;
4848
use mem;
4949
use mem::size_of;
5050
use kinds::marker;
51-
use raw::{Repr};
51+
use raw::Repr;
5252
// Avoid conflicts with *both* the Slice trait (buggy) and the `slice::raw` module.
5353
use RawSlice = raw::Slice;
5454

@@ -227,19 +227,17 @@ pub trait ImmutableSlice<'a, T> {
227227
#[deprecated = "use binary_search"]
228228
fn bsearch(&self, f: |&T| -> Ordering) -> Option<uint>;
229229

230-
/**
231-
* Binary search a sorted vector with a comparator function.
232-
*
233-
* The comparator function should implement an order consistent
234-
* with the sort order of the underlying vector, returning an
235-
* order code that indicates whether its argument is `Less`,
236-
* `Equal` or `Greater` the desired target.
237-
*
238-
* If the value is found then `Found` is returned, containing the
239-
* index of the matching element; if the value is not found then
240-
* `NotFound` is returned, containing the index where a matching
241-
* element could be inserted while maintaining sorted order.
242-
*/
230+
/// Binary search a sorted vector with a comparator function.
231+
///
232+
/// The comparator function should implement an order consistent
233+
/// with the sort order of the underlying vector, returning an
234+
/// order code that indicates whether its argument is `Less`,
235+
/// `Equal` or `Greater` the desired target.
236+
///
237+
/// If the value is found then `Found` is returned, containing the
238+
/// index of the matching element; if the value is not found then
239+
/// `NotFound` is returned, containing the index where a matching
240+
/// element could be inserted while maintaining sorted order.
243241
#[unstable]
244242
fn binary_search(&self, f: |&T| -> Ordering) -> BinarySearchResult;
245243

0 commit comments

Comments
 (0)