Skip to content

Commit d8893c0

Browse files
committed
---
yaml --- r: 154333 b: refs/heads/try2 c: c3b9d5d h: refs/heads/master i: 154331: 395e3c9 v: v3
1 parent d208f38 commit d8893c0

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: bc450b17e3bfe1c195f8f286a3228cca1f706a74
8+
refs/heads/try2: c3b9d5df6250ef021acf993576d52dd7a29a6bba
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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)