Skip to content

Commit 63afb8c

Browse files
borsbors
committed
auto merge of #7430 : huonw/rust/vec-kill, r=thestinger
2 parents 4c86a04 + 366ca44 commit 63afb8c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+546
-719
lines changed

‎doc/rust.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2620,7 +2620,7 @@ assert!(b != "world");
26202620

26212621
The vector type constructor represents a homogeneous array of values of a given type.
26222622
A vector has a fixed size.
2623-
(Operations like `vec::push` operate solely on owned vectors.)
2623+
(Operations like `vec.push` operate solely on owned vectors.)
26242624
A vector type can be annotated with a _definite_ size,
26252625
written with a trailing asterisk and integer literal, such as `[int * 10]`.
26262626
Such a definite-sized vector type is a first-class type, since its size is known statically.

‎src/compiletest/compiletest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pub fn parse_config(args: ~[~str]) -> config {
7575
];
7676

7777
assert!(!args.is_empty());
78-
let args_ = vec::tail(args);
78+
let args_ = args.tail();
7979
let matches =
8080
&match getopts::getopts(args_, opts) {
8181
Ok(m) => m,

‎src/compiletest/runtest.rs

+1-2
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/arc.rs

-1
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ mod tests {
517517

518518
use arc::*;
519519

520-
use core::vec;
521520
use core::cell::Cell;
522521
use core::comm;
523522
use core::task;

‎src/libextra/c_vec.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ mod tests {
159159

160160
assert!(mem as int != 0);
161161

162-
return c_vec_with_dtor(mem as *mut u8, n as uint,
163-
|| unsafe { free(mem) });
162+
c_vec_with_dtor(mem as *mut u8, n as uint, || free(mem))
164163
}
165164
}
166165

‎src/libextra/crypto/sha2.rs

+39-40
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/deque.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl<T> Deque<T> {
137137
///
138138
/// * n - The number of elements to reserve space for
139139
pub fn reserve(&mut self, n: uint) {
140-
vec::reserve(&mut self.elts, n);
140+
self.elts.reserve(n);
141141
}
142142

143143
/// Reserve capacity for at least `n` elements in the given deque,
@@ -151,7 +151,7 @@ impl<T> Deque<T> {
151151
///
152152
/// * n - The number of elements to reserve space for
153153
pub fn reserve_at_least(&mut self, n: uint) {
154-
vec::reserve_at_least(&mut self.elts, n);
154+
self.elts.reserve_at_least(n);
155155
}
156156

157157
/// Front-to-back iterator.
@@ -256,7 +256,6 @@ mod tests {
256256
use super::*;
257257
use core::cmp::Eq;
258258
use core::kinds::Copy;
259-
use core::vec::capacity;
260259
use core;
261260

262261
#[test]
@@ -442,23 +441,23 @@ mod tests {
442441
let mut d = Deque::new();
443442
d.add_back(0u64);
444443
d.reserve(50);
445-
assert_eq!(capacity(&mut d.elts), 50);
444+
assert_eq!(d.elts.capacity(), 50);
446445
let mut d = Deque::new();
447446
d.add_back(0u32);
448447
d.reserve(50);
449-
assert_eq!(capacity(&mut d.elts), 50);
448+
assert_eq!(d.elts.capacity(), 50);
450449
}
451450

452451
#[test]
453452
fn test_reserve_at_least() {
454453
let mut d = Deque::new();
455454
d.add_back(0u64);
456455
d.reserve_at_least(50);
457-
assert_eq!(capacity(&mut d.elts), 64);
456+
assert_eq!(d.elts.capacity(), 64);
458457
let mut d = Deque::new();
459458
d.add_back(0u32);
460459
d.reserve_at_least(50);
461-
assert_eq!(capacity(&mut d.elts), 64);
460+
assert_eq!(d.elts.capacity(), 64);
462461
}
463462

464463
#[test]

‎src/libextra/dlist.rs

-2
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,6 @@ mod tests {
526526

527527
use super::*;
528528

529-
use core::vec;
530-
531529
#[test]
532530
fn test_dlist_concat() {
533531
let a = from_vec([1,2]);

‎src/libextra/ebml.rs

+1-2
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

+6-18
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!(
@@ -1459,33 +1457,23 @@ mod test {
14591457

14601458
#[test]
14611459
fn test_gl_tcp_server_and_client_ipv4() {
1462-
unsafe {
1463-
impl_gl_tcp_ipv4_server_and_client();
1464-
}
1460+
impl_gl_tcp_ipv4_server_and_client();
14651461
}
14661462
#[test]
14671463
fn test_gl_tcp_get_peer_addr() {
1468-
unsafe {
1469-
impl_gl_tcp_ipv4_get_peer_addr();
1470-
}
1464+
impl_gl_tcp_ipv4_get_peer_addr();
14711465
}
14721466
#[test]
14731467
fn test_gl_tcp_ipv4_client_error_connection_refused() {
1474-
unsafe {
1475-
impl_gl_tcp_ipv4_client_error_connection_refused();
1476-
}
1468+
impl_gl_tcp_ipv4_client_error_connection_refused();
14771469
}
14781470
#[test]
14791471
fn test_gl_tcp_server_address_in_use() {
1480-
unsafe {
1481-
impl_gl_tcp_ipv4_server_address_in_use();
1482-
}
1472+
impl_gl_tcp_ipv4_server_address_in_use();
14831473
}
14841474
#[test]
14851475
fn test_gl_tcp_server_access_denied() {
1486-
unsafe {
1487-
impl_gl_tcp_ipv4_server_access_denied();
1488-
}
1476+
impl_gl_tcp_ipv4_server_access_denied();
14891477
}
14901478
// Strange failure on Windows. --pcwalton
14911479
#[test]

‎src/libextra/num/bigint.rs

+8-9
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/priority_queue.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ impl<T:Ord> PriorityQueue<T> {
5252
}
5353

5454
/// Returns the number of elements the queue can hold without reallocating
55-
pub fn capacity(&self) -> uint { vec::capacity(&self.data) }
55+
pub fn capacity(&self) -> uint { self.data.capacity() }
5656

57-
pub fn reserve(&mut self, n: uint) { vec::reserve(&mut self.data, n) }
57+
pub fn reserve(&mut self, n: uint) { self.data.reserve(n) }
5858

5959
pub fn reserve_at_least(&mut self, n: uint) {
60-
vec::reserve_at_least(&mut self.data, n)
60+
self.data.reserve_at_least(n)
6161
}
6262

6363
/// Pop the greatest item from the queue - fails if empty

0 commit comments

Comments
 (0)