Skip to content

Commit d0512b1

Browse files
huonwhuonw
committed
Convert vec::[mut_]slice to methods, remove vec::const_slice.
1 parent f1e09d6 commit d0512b1

File tree

29 files changed

+151
-198
lines changed

29 files changed

+151
-198
lines changed

‎src/compiletest/runtest.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,7 @@ fn check_error_patterns(props: &TestProps,
321321
if done { return; }
322322

323323
let missing_patterns =
324-
vec::slice(props.error_patterns, next_err_idx,
325-
props.error_patterns.len());
324+
props.error_patterns.slice(next_err_idx, props.error_patterns.len());
326325
if missing_patterns.len() == 1u {
327326
fatal_ProcRes(fmt!("error pattern '%s' not found!",
328327
missing_patterns[0]), ProcRes);

‎src/libextra/crypto/sha2.rs‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use core::prelude::*;
1212

1313
use core::uint;
14-
use core::vec;
1514

1615
use digest::Digest;
1716

@@ -118,7 +117,7 @@ impl Engine512 {
118117
}
119118

120119
while in.len() - i >= 8 {
121-
let w = to_u64(vec::slice(in, i, i + 8));
120+
let w = to_u64(in.slice(i, i + 8));
122121
self.process_word(w);
123122
self.bit_counter.add_bytes(8);
124123
i += 8;
@@ -274,43 +273,43 @@ impl Engine512 {
274273
fn result_512(&mut self, out: &mut [u8]) {
275274
self.finish();
276275

277-
from_u64(self.H0, vec::mut_slice(out, 0, 8));
278-
from_u64(self.H1, vec::mut_slice(out, 8, 16));
279-
from_u64(self.H2, vec::mut_slice(out, 16, 24));
280-
from_u64(self.H3, vec::mut_slice(out, 24, 32));
281-
from_u64(self.H4, vec::mut_slice(out, 32, 40));
282-
from_u64(self.H5, vec::mut_slice(out, 40, 48));
283-
from_u64(self.H6, vec::mut_slice(out, 48, 56));
284-
from_u64(self.H7, vec::mut_slice(out, 56, 64));
276+
from_u64(self.H0, out.mut_slice(0, 8));
277+
from_u64(self.H1, out.mut_slice(8, 16));
278+
from_u64(self.H2, out.mut_slice(16, 24));
279+
from_u64(self.H3, out.mut_slice(24, 32));
280+
from_u64(self.H4, out.mut_slice(32, 40));
281+
from_u64(self.H5, out.mut_slice(40, 48));
282+
from_u64(self.H6, out.mut_slice(48, 56));
283+
from_u64(self.H7, out.mut_slice(56, 64));
285284
}
286285

287286
fn result_384(&mut self, out: &mut [u8]) {
288287
self.finish();
289288

290-
from_u64(self.H0, vec::mut_slice(out, 0, 8));
291-
from_u64(self.H1, vec::mut_slice(out, 8, 16));
292-
from_u64(self.H2, vec::mut_slice(out, 16, 24));
293-
from_u64(self.H3, vec::mut_slice(out, 24, 32));
294-
from_u64(self.H4, vec::mut_slice(out, 32, 40));
295-
from_u64(self.H5, vec::mut_slice(out, 40, 48));
289+
from_u64(self.H0, out.mut_slice(0, 8));
290+
from_u64(self.H1, out.mut_slice(8, 16));
291+
from_u64(self.H2, out.mut_slice(16, 24));
292+
from_u64(self.H3, out.mut_slice(24, 32));
293+
from_u64(self.H4, out.mut_slice(32, 40));
294+
from_u64(self.H5, out.mut_slice(40, 48));
296295
}
297296

298297
fn result_256(&mut self, out: &mut [u8]) {
299298
self.finish();
300299

301-
from_u64(self.H0, vec::mut_slice(out, 0, 8));
302-
from_u64(self.H1, vec::mut_slice(out, 8, 16));
303-
from_u64(self.H2, vec::mut_slice(out, 16, 24));
304-
from_u64(self.H3, vec::mut_slice(out, 24, 32));
300+
from_u64(self.H0, out.mut_slice(0, 8));
301+
from_u64(self.H1, out.mut_slice(8, 16));
302+
from_u64(self.H2, out.mut_slice(16, 24));
303+
from_u64(self.H3, out.mut_slice(24, 32));
305304
}
306305

307306
fn result_224(&mut self, out: &mut [u8]) {
308307
self.finish();
309308

310-
from_u64(self.H0, vec::mut_slice(out, 0, 8));
311-
from_u64(self.H1, vec::mut_slice(out, 8, 16));
312-
from_u64(self.H2, vec::mut_slice(out, 16, 24));
313-
from_u32((self.H3 >> 32) as u32, vec::mut_slice(out, 24, 28));
309+
from_u64(self.H0, out.mut_slice(0, 8));
310+
from_u64(self.H1, out.mut_slice(8, 16));
311+
from_u64(self.H2, out.mut_slice(16, 24));
312+
from_u32((self.H3 >> 32) as u32, out.mut_slice(24, 28));
314313
}
315314
}
316315

@@ -400,7 +399,7 @@ impl Engine256 {
400399
}
401400

402401
while in.len() - i >= 4 {
403-
let w = to_u32(vec::slice(in, i, i + 4));
402+
let w = to_u32(in.slice(i, i + 4));
404403
self.process_word(w);
405404
self.length_bytes += 4;
406405
i += 4;
@@ -556,26 +555,26 @@ impl Engine256 {
556555
fn result_256(&mut self, out: &mut [u8]) {
557556
self.finish();
558557

559-
from_u32(self.H0, vec::mut_slice(out, 0, 4));
560-
from_u32(self.H1, vec::mut_slice(out, 4, 8));
561-
from_u32(self.H2, vec::mut_slice(out, 8, 12));
562-
from_u32(self.H3, vec::mut_slice(out, 12, 16));
563-
from_u32(self.H4, vec::mut_slice(out, 16, 20));
564-
from_u32(self.H5, vec::mut_slice(out, 20, 24));
565-
from_u32(self.H6, vec::mut_slice(out, 24, 28));
566-
from_u32(self.H7, vec::mut_slice(out, 28, 32));
558+
from_u32(self.H0, out.mut_slice(0, 4));
559+
from_u32(self.H1, out.mut_slice(4, 8));
560+
from_u32(self.H2, out.mut_slice(8, 12));
561+
from_u32(self.H3, out.mut_slice(12, 16));
562+
from_u32(self.H4, out.mut_slice(16, 20));
563+
from_u32(self.H5, out.mut_slice(20, 24));
564+
from_u32(self.H6, out.mut_slice(24, 28));
565+
from_u32(self.H7, out.mut_slice(28, 32));
567566
}
568567

569568
fn result_224(&mut self, out: &mut [u8]) {
570569
self.finish();
571570

572-
from_u32(self.H0, vec::mut_slice(out, 0, 4));
573-
from_u32(self.H1, vec::mut_slice(out, 4, 8));
574-
from_u32(self.H2, vec::mut_slice(out, 8, 12));
575-
from_u32(self.H3, vec::mut_slice(out, 12, 16));
576-
from_u32(self.H4, vec::mut_slice(out, 16, 20));
577-
from_u32(self.H5, vec::mut_slice(out, 20, 24));
578-
from_u32(self.H6, vec::mut_slice(out, 24, 28));
571+
from_u32(self.H0, out.mut_slice(0, 4));
572+
from_u32(self.H1, out.mut_slice(4, 8));
573+
from_u32(self.H2, out.mut_slice(8, 12));
574+
from_u32(self.H3, out.mut_slice(12, 16));
575+
from_u32(self.H4, out.mut_slice(16, 20));
576+
from_u32(self.H5, out.mut_slice(20, 24));
577+
from_u32(self.H6, out.mut_slice(24, 28));
579578
}
580579
}
581580

‎src/libextra/ebml.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ pub mod reader {
8585
use core::ptr::offset;
8686
use core::str;
8787
use core::unstable::intrinsics::bswap32;
88-
use core::vec;
8988

9089
// ebml reading
9190

@@ -248,7 +247,7 @@ pub mod reader {
248247
}
249248

250249
pub fn with_doc_data<T>(d: Doc, f: &fn(x: &[u8]) -> T) -> T {
251-
f(vec::slice(*d.data, d.start, d.end))
250+
f(d.data.slice(d.start, d.end))
252251
}
253252

254253

‎src/libextra/net_tcp.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -976,9 +976,7 @@ impl io::Writer for TcpSocketBuf {
976976
let socket_data_ptr: *TcpSocketData =
977977
&(*((*(self.data)).sock).socket_data);
978978
let w_result = write_common_impl(socket_data_ptr,
979-
vec::slice(data,
980-
0,
981-
data.len()).to_owned());
979+
data.slice(0, data.len()).to_owned());
982980
if w_result.is_err() {
983981
let err_data = w_result.get_err();
984982
debug!(

‎src/libextra/num/bigint.rs‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,8 @@ impl Mul<BigUint, BigUint> for BigUint {
298298

299299
fn cut_at(a: &BigUint, n: uint) -> (BigUint, BigUint) {
300300
let mid = uint::min(a.data.len(), n);
301-
return (BigUint::from_slice(vec::slice(a.data, mid,
302-
a.data.len())),
303-
BigUint::from_slice(vec::slice(a.data, 0, mid)));
301+
return (BigUint::from_slice(a.data.slice(mid, a.data.len())),
302+
BigUint::from_slice(a.data.slice(0, mid)));
304303
}
305304

306305

@@ -413,7 +412,7 @@ impl Integer for BigUint {
413412
return (Zero::zero(), Zero::zero(), copy *a);
414413
}
415414

416-
let an = vec::slice(a.data, a.data.len() - n, a.data.len());
415+
let an = a.data.slice(a.data.len() - n, a.data.len());
417416
let bn = *b.data.last();
418417
let mut d = ~[];
419418
let mut carry = 0;
@@ -578,7 +577,7 @@ impl BigUint {
578577
let mut power: BigUint = One::one();
579578
loop {
580579
let start = uint::max(end, unit_len) - unit_len;
581-
match uint::parse_bytes(vec::slice(buf, start, end), radix) {
580+
match uint::parse_bytes(buf.slice(start, end), radix) {
582581
// FIXME(#6102): Assignment operator for BigInt causes ICE
583582
// Some(d) => n += BigUint::from_uint(d) * power,
584583
Some(d) => n = n + BigUint::from_uint(d) * power,
@@ -634,7 +633,7 @@ impl BigUint {
634633
if n_unit == 0 { return copy *self; }
635634
if self.data.len() < n_unit { return Zero::zero(); }
636635
return BigUint::from_slice(
637-
vec::slice(self.data, n_unit, self.data.len())
636+
self.data.slice(n_unit, self.data.len())
638637
);
639638
}
640639

@@ -1132,7 +1131,7 @@ impl BigInt {
11321131
sign = Minus;
11331132
start = 1;
11341133
}
1135-
return BigUint::parse_bytes(vec::slice(buf, start, buf.len()), radix)
1134+
return BigUint::parse_bytes(buf.slice(start, buf.len()), radix)
11361135
.map_consume(|bu| BigInt::from_biguint(sign, bu));
11371136
}
11381137
@@ -1176,7 +1175,7 @@ mod biguint_tests {
11761175
let data = [ &[], &[1], &[2], &[-1], &[0, 1], &[2, 1], &[1, 1, 1] ]
11771176
.map(|v| BigUint::from_slice(*v));
11781177
for data.iter().enumerate().advance |(i, ni)| {
1179-
for vec::slice(data, i, data.len()).iter().enumerate().advance |(j0, nj)| {
1178+
for data.slice(i, data.len()).iter().enumerate().advance |(j0, nj)| {
11801179
let j = j0 + i;
11811180
if i == j {
11821181
assert_eq!(ni.cmp(nj), Equal);
@@ -1654,7 +1653,7 @@ mod bigint_tests {
16541653
nums.push_all_move(vs.map(|s| BigInt::from_slice(Plus, *s)));
16551654

16561655
for nums.iter().enumerate().advance |(i, ni)| {
1657-
for vec::slice(nums, i, nums.len()).iter().enumerate().advance |(j0, nj)| {
1656+
for nums.slice(i, nums.len()).iter().enumerate().advance |(j0, nj)| {
16581657
let j = i + j0;
16591658
if i == j {
16601659
assert_eq!(ni.cmp(nj), Equal);

‎src/libextra/sort.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ pub fn merge_sort<T:Copy>(v: &[T], le: Le<T>) -> ~[T] {
5757
a_ix += 1;
5858
} else { rs.push(copy b[b_ix]); b_ix += 1; }
5959
}
60-
rs.push_all(vec::slice(a, a_ix, a_len));
61-
rs.push_all(vec::slice(b, b_ix, b_len));
60+
rs.push_all(a.slice(a_ix, a_len));
61+
rs.push_all(b.slice(b_ix, b_len));
6262
rs
6363
}
6464
}
@@ -201,12 +201,12 @@ pub fn tim_sort<T:Copy + Ord>(array: &mut [T]) {
201201
loop {
202202
let run_len: uint = {
203203
// This scope contains the slice `arr` here:
204-
let arr = vec::mut_slice(array, idx, size);
204+
let arr = array.mut_slice(idx, size);
205205
let mut run_len: uint = count_run_ascending(arr);
206206

207207
if run_len < min_run {
208208
let force = if remaining <= min_run {remaining} else {min_run};
209-
let slice = vec::mut_slice(arr, 0, force);
209+
let slice = arr.mut_slice(0, force);
210210
binarysort(slice, run_len);
211211
run_len = force;
212212
}
@@ -443,14 +443,14 @@ impl<T:Copy + Ord> MergeState<T> {
443443
}
444444

445445
let k = { // constrain lifetime of slice below
446-
let slice = vec::slice(array, b1, b1+l1);
446+
let slice = array.slice(b1, b1+l1);
447447
gallop_right(&array[b2], slice, 0)
448448
};
449449
b1 += k;
450450
l1 -= k;
451451
if l1 != 0 {
452452
let l2 = { // constrain lifetime of slice below
453-
let slice = vec::slice(array, b2, b2+l2);
453+
let slice = array.slice(b2, b2+l2);
454454
gallop_left(&array[b1+l1-1],slice,l2-1)
455455
};
456456
if l2 > 0 {
@@ -526,7 +526,7 @@ impl<T:Copy + Ord> MergeState<T> {
526526
assert!(len1 > 1 && len2 != 0);
527527

528528
count1 = {
529-
let tmp_view = vec::slice(tmp, c1, c1+len1);
529+
let tmp_view = tmp.slice(c1, c1+len1);
530530
gallop_right(&array[c2], tmp_view, 0)
531531
};
532532
if count1 != 0 {
@@ -539,7 +539,7 @@ impl<T:Copy + Ord> MergeState<T> {
539539
if len2 == 0 { break_outer = true; break; }
540540

541541
count2 = {
542-
let tmp_view = vec::slice(array, c2, c2+len2);
542+
let tmp_view = array.slice(c2, c2+len2);
543543
gallop_left(&tmp[c1], tmp_view, 0)
544544
};
545545
if count2 != 0 {
@@ -638,7 +638,7 @@ impl<T:Copy + Ord> MergeState<T> {
638638
assert!(len2 > 1 && len1 != 0);
639639

640640
{ // constrain scope of tmp_view:
641-
let tmp_view = vec::mut_slice (array, base1, base1+len1);
641+
let tmp_view = array.mut_slice(base1, base1+len1);
642642
count1 = len1 - gallop_right(
643643
&tmp[c2], tmp_view, len1-1);
644644
}
@@ -655,7 +655,7 @@ impl<T:Copy + Ord> MergeState<T> {
655655

656656
let count2;
657657
{ // constrain scope of tmp_view
658-
let tmp_view = vec::mut_slice(tmp, 0, len2);
658+
let tmp_view = tmp.mut_slice(0, len2);
659659
count2 = len2 - gallop_left(&array[c1],
660660
tmp_view,
661661
len2-1);
@@ -1111,7 +1111,7 @@ mod big_tests {
11111111
isSorted(arr);
11121112

11131113
let mut arr = if n > 4 {
1114-
let part = vec::slice(arr, 0, 4);
1114+
let part = arr.slice(0, 4);
11151115
multiplyVec(part, n)
11161116
} else { arr };
11171117
tim_sort(arr); // ~sort
@@ -1183,7 +1183,7 @@ mod big_tests {
11831183
isSorted(arr);
11841184

11851185
let mut arr = if n > 4 {
1186-
let part = vec::slice(arr, 0, 4);
1186+
let part = arr.slice(0, 4);
11871187
multiplyVec(part, n)
11881188
} else { arr };
11891189
tim_sort(arr); // ~sort

‎src/librustc/back/rpath.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ pub fn get_relative_to(abs1: &Path, abs2: &Path) -> Path {
154154
let mut path = ~[];
155155
for uint::range(start_idx, len1 - 1) |_i| { path.push(~".."); };
156156

157-
path.push_all(vec::slice(split2, start_idx, len2 - 1));
157+
path.push_all(split2.slice(start_idx, len2 - 1));
158158

159159
return if !path.is_empty() {
160160
Path("").push_many(path)

‎src/librustc/metadata/decoder.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn lookup_hash(d: ebml::Doc, eq_fn: &fn(x:&[u8]) -> bool, hash: uint) ->
6060
let belt = tag_index_buckets_bucket_elt;
6161
for reader::tagged_docs(tagged_doc.doc, belt) |elt| {
6262
let pos = io::u64_from_be_bytes(*elt.data, elt.start, 4u) as uint;
63-
if eq_fn(vec::slice(*elt.data, elt.start + 4u, elt.end)) {
63+
if eq_fn(elt.data.slice(elt.start + 4u, elt.end)) {
6464
return Some(reader::doc_at(d.data, pos).doc);
6565
}
6666
};
@@ -72,7 +72,7 @@ pub type GetCrateDataCb<'self> = &'self fn(ast::crate_num) -> cmd;
7272
pub fn maybe_find_item(item_id: int, items: ebml::Doc) -> Option<ebml::Doc> {
7373
fn eq_item(bytes: &[u8], item_id: int) -> bool {
7474
return io::u64_from_be_bytes(
75-
vec::slice(bytes, 0u, 4u), 0u, 4u) as int
75+
bytes.slice(0u, 4u), 0u, 4u) as int
7676
== item_id;
7777
}
7878
lookup_hash(items,

‎src/librustc/metadata/tydecode.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use middle::ty;
2020

2121
use core::str;
2222
use core::uint;
23-
use core::vec;
2423
use syntax::abi::AbiSet;
2524
use syntax::abi;
2625
use syntax::ast;
@@ -519,8 +518,8 @@ pub fn parse_def_id(buf: &[u8]) -> ast::def_id {
519518
fail!();
520519
}
521520

522-
let crate_part = vec::slice(buf, 0u, colon_idx);
523-
let def_part = vec::slice(buf, colon_idx + 1u, len);
521+
let crate_part = buf.slice(0u, colon_idx);
522+
let def_part = buf.slice(colon_idx + 1u, len);
524523

525524
let crate_num = match uint::parse_bytes(crate_part, 10u) {
526525
Some(cn) => cn as int,

0 commit comments

Comments
 (0)