Skip to content

Commit c582360

Browse files
huonwhuonw
committed
---
yaml --- r: 66334 b: refs/heads/master c: 1cb0a56 h: refs/heads/master v: v3
1 parent e56a379 commit c582360

Some content is hidden

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

98 files changed

+927
-973
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 7295a6da92ac4bfcbc714848bd611dae54df0b67
2+
refs/heads/master: 1cb0a567d1209855b476689b0e449a832035f05b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

‎trunk/src/compiletest/compiletest.rs

Lines changed: 2 additions & 10 deletions
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,
@@ -254,17 +254,9 @@ pub fn make_test(config: &config, testfile: &Path) -> test::TestDescAndFn {
254254
}
255255

256256
pub fn make_test_name(config: &config, testfile: &Path) -> test::TestName {
257-
258-
// Try to elide redundant long paths
259-
fn shorten(path: &Path) -> ~str {
260-
let filename = path.filename();
261-
let dir = path.pop().filename();
262-
fmt!("%s/%s", dir.get_or_default(~""), filename.get_or_default(~""))
263-
}
264-
265257
test::DynTestName(fmt!("[%s] %s",
266258
mode_str(config.mode),
267-
shorten(testfile)))
259+
testfile.to_str()))
268260
}
269261

270262
pub fn make_test_closure(config: &config, testfile: &Path) -> test::TestFn {

‎trunk/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);

‎trunk/src/etc/vim/syntax/rust.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
" Language: Rust
33
" Maintainer: Patrick Walton <[email protected]>
44
" Maintainer: Ben Blum <[email protected]>
5-
" Last Change: 2013 Jun 14
5+
" Last Change: 2012 Jun 14
66

77
if version < 600
88
syntax clear

‎trunk/src/libextra/arc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*
2020
* ~~~ {.rust}
2121
* extern mod std;
22-
* use extra::arc;
22+
* use std::arc;
2323
* let numbers=vec::from_fn(100, |ind| (ind as float)*rand::random());
2424
* let shared_numbers=arc::ARC(numbers);
2525
*

‎trunk/src/libextra/base64.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ impl<'self> ToBase64 for &'self [u8] {
3636
* # Example
3737
*
3838
* ~~~ {.rust}
39-
* extern mod extra;
40-
* use extra::base64::ToBase64;
39+
* extern mod std;
40+
* use std::base64::ToBase64;
4141
*
4242
* fn main () {
4343
* let str = [52,32].to_base64();
@@ -99,8 +99,8 @@ impl<'self> ToBase64 for &'self str {
9999
* # Example
100100
*
101101
* ~~~ {.rust}
102-
* extern mod extra;
103-
* use extra::base64::ToBase64;
102+
* extern mod std;
103+
* use std::base64::ToBase64;
104104
*
105105
* fn main () {
106106
* let str = "Hello, World".to_base64();
@@ -127,9 +127,9 @@ impl<'self> FromBase64 for &'self [u8] {
127127
* # Example
128128
*
129129
* ~~~ {.rust}
130-
* extern mod extra;
131-
* use extra::base64::ToBase64;
132-
* use extra::base64::FromBase64;
130+
* extern mod std;
131+
* use std::base64::ToBase64;
132+
* use std::base64::FromBase64;
133133
*
134134
* fn main () {
135135
* let str = [52,32].to_base64();
@@ -207,9 +207,9 @@ impl<'self> FromBase64 for &'self str {
207207
* This converts a string literal to base64 and back.
208208
*
209209
* ~~~ {.rust}
210-
* extern mod extra;
211-
* use extra::base64::ToBase64;
212-
* use extra::base64::FromBase64;
210+
* extern mod std;
211+
* use std::base64::ToBase64;
212+
* use std::base64::FromBase64;
213213
* use core::str;
214214
*
215215
* fn main () {

‎trunk/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

‎trunk/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

‎trunk/src/libextra/future.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* ~~~ {.rust}
1818
* # fn fib(n: uint) -> uint {42};
1919
* # fn make_a_sandwich() {};
20-
* let mut delayed_fib = extra::future::spawn (|| fib(5000) );
20+
* let mut delayed_fib = std::future::spawn (|| fib(5000) );
2121
* make_a_sandwich();
2222
* println(fmt!("fib(5000) = %?", delayed_fib.get()))
2323
* ~~~

‎trunk/src/libextra/net_ip.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ pub struct ParseAddrErr {
5555
*
5656
* # Arguments
5757
*
58-
* * ip - a `extra::net::ip::IpAddr`
58+
* * ip - a `std::net::ip::IpAddr`
5959
*/
6060
pub fn format_addr(ip: &IpAddr) -> ~str {
6161
match *ip {
@@ -80,7 +80,7 @@ pub fn format_addr(ip: &IpAddr) -> ~str {
8080
* Get the associated port
8181
*
8282
* # Arguments
83-
* * ip - a `extra::net::ip::IpAddr`
83+
* * ip - a `std::net::ip::IpAddr`
8484
*/
8585
pub fn get_port(ip: &IpAddr) -> uint {
8686
match *ip {

‎trunk/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!(

‎trunk/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);

0 commit comments

Comments
 (0)