Skip to content

Commit d66c9dd

Browse files
brsonbrson
committed
---
yaml --- r: 63790 b: refs/heads/snap-stage3 c: 59905d1 h: refs/heads/master v: v3
1 parent 3fb165a commit d66c9dd

Some content is hidden

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

58 files changed

+759
-621
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 0aa94ff3c3419fdd58d87ad226d94ee0128f778b
4+
refs/heads/snap-stage3: 59905d1f27192797bd5fd81c8ace934955be8a81
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/Makefile.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,9 @@ endif
141141
CFG_GIT_DIR := $(CFG_SRC_DIR).git
142142
CFG_RELEASE = 0.7-pre
143143
CFG_VERSION = $(CFG_RELEASE)
144+
# windows exe's need numeric versions - don't use anything but
145+
# numbers and dots here
146+
CFG_VERSION_WIN = 0.7
144147

145148
ifneq ($(wildcard $(CFG_GIT)),)
146149
ifneq ($(wildcard $(CFG_GIT_DIR)),)
@@ -311,6 +314,7 @@ $(foreach host,$(CFG_HOST_TRIPLES), \
311314
export CFG_SRC_DIR
312315
export CFG_BUILD_DIR
313316
export CFG_VERSION
317+
export CFG_VERSION_WIN
314318
export CFG_BUILD_TRIPLE
315319
export CFG_LLVM_ROOT
316320
export CFG_ENABLE_MINGW_CROSS

‎branches/snap-stage3/doc/rust.md

Lines changed: 1 addition & 1 deletion
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.

‎branches/snap-stage3/src/compiletest/compiletest.rs

Lines changed: 1 addition & 1 deletion
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_ = args.tail();
78+
let args_ = vec::tail(args);
7979
let matches =
8080
&match getopts::getopts(args_, opts) {
8181
Ok(m) => m,

‎branches/snap-stage3/src/compiletest/runtest.rs

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

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

‎branches/snap-stage3/src/etc/pkg/rust.iss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#define CFG_VERSION GetEnv("CFG_VERSION")
2+
#define CFG_VERSION_WIN GetEnv("CFG_VERSION_WIN")
23

34
[Setup]
45

@@ -8,7 +9,7 @@ AppVersion={#CFG_VERSION}
89
AppCopyright=Copyright (C) 2006-2013 Mozilla Foundation, MIT license
910
AppPublisher=Mozilla Foundation
1011
AppPublisherURL=http://www.rust-lang.org
11-
VersionInfoVersion={#CFG_VERSION}
12+
VersionInfoVersion={#CFG_VERSION_WIN}
1213
LicenseFile=LICENSE.txt
1314

1415
DisableWelcomePage=true

‎branches/snap-stage3/src/libextra/arc.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ mod tests {
517517

518518
use arc::*;
519519

520+
use core::vec;
520521
use core::cell::Cell;
521522
use core::comm;
522523
use core::task;

‎branches/snap-stage3/src/libextra/c_vec.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ mod tests {
159159

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

162-
c_vec_with_dtor(mem as *mut u8, n as uint, || free(mem))
162+
return c_vec_with_dtor(mem as *mut u8, n as uint,
163+
|| unsafe { free(mem) });
163164
}
164165
}
165166

‎branches/snap-stage3/src/libextra/crypto/sha2.rs

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

1313
use core::uint;
14+
use core::vec;
1415

1516
use digest::Digest;
1617

@@ -117,7 +118,7 @@ impl Engine512 {
117118
}
118119

119120
while in.len() - i >= 8 {
120-
let w = to_u64(in.slice(i, i + 8));
121+
let w = to_u64(vec::slice(in, i, i + 8));
121122
self.process_word(w);
122123
self.bit_counter.add_bytes(8);
123124
i += 8;
@@ -273,43 +274,43 @@ impl Engine512 {
273274
fn result_512(&mut self, out: &mut [u8]) {
274275
self.finish();
275276

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));
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));
284285
}
285286

286287
fn result_384(&mut self, out: &mut [u8]) {
287288
self.finish();
288289

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));
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));
295296
}
296297

297298
fn result_256(&mut self, out: &mut [u8]) {
298299
self.finish();
299300

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));
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));
304305
}
305306

306307
fn result_224(&mut self, out: &mut [u8]) {
307308
self.finish();
308309

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));
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));
313314
}
314315
}
315316

@@ -399,7 +400,7 @@ impl Engine256 {
399400
}
400401

401402
while in.len() - i >= 4 {
402-
let w = to_u32(in.slice(i, i + 4));
403+
let w = to_u32(vec::slice(in, i, i + 4));
403404
self.process_word(w);
404405
self.length_bytes += 4;
405406
i += 4;
@@ -555,26 +556,26 @@ impl Engine256 {
555556
fn result_256(&mut self, out: &mut [u8]) {
556557
self.finish();
557558

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));
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));
566567
}
567568

568569
fn result_224(&mut self, out: &mut [u8]) {
569570
self.finish();
570571

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));
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));
578579
}
579580
}
580581

‎branches/snap-stage3/src/libextra/deque.rs

Lines changed: 7 additions & 6 deletions
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-
self.elts.reserve(n);
140+
vec::reserve(&mut self.elts, 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-
self.elts.reserve_at_least(n);
154+
vec::reserve_at_least(&mut self.elts, n);
155155
}
156156

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

261262
#[test]
@@ -441,23 +442,23 @@ mod tests {
441442
let mut d = Deque::new();
442443
d.add_back(0u64);
443444
d.reserve(50);
444-
assert_eq!(d.elts.capacity(), 50);
445+
assert_eq!(capacity(&mut d.elts), 50);
445446
let mut d = Deque::new();
446447
d.add_back(0u32);
447448
d.reserve(50);
448-
assert_eq!(d.elts.capacity(), 50);
449+
assert_eq!(capacity(&mut d.elts), 50);
449450
}
450451

451452
#[test]
452453
fn test_reserve_at_least() {
453454
let mut d = Deque::new();
454455
d.add_back(0u64);
455456
d.reserve_at_least(50);
456-
assert_eq!(d.elts.capacity(), 64);
457+
assert_eq!(capacity(&mut d.elts), 64);
457458
let mut d = Deque::new();
458459
d.add_back(0u32);
459460
d.reserve_at_least(50);
460-
assert_eq!(d.elts.capacity(), 64);
461+
assert_eq!(capacity(&mut d.elts), 64);
461462
}
462463

463464
#[test]

‎branches/snap-stage3/src/libextra/dlist.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,8 @@ mod tests {
526526

527527
use super::*;
528528

529+
use core::vec;
530+
529531
#[test]
530532
fn test_dlist_concat() {
531533
let a = from_vec([1,2]);

‎branches/snap-stage3/src/libextra/ebml.rs

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

8990
// ebml reading
9091

@@ -247,7 +248,7 @@ pub mod reader {
247248
}
248249

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

253254

‎branches/snap-stage3/src/libextra/net_tcp.rs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,9 @@ 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-
data.slice(0, data.len()).to_owned());
979+
vec::slice(data,
980+
0,
981+
data.len()).to_owned());
980982
if w_result.is_err() {
981983
let err_data = w_result.get_err();
982984
debug!(
@@ -1457,23 +1459,33 @@ mod test {
14571459

14581460
#[test]
14591461
fn test_gl_tcp_server_and_client_ipv4() {
1460-
impl_gl_tcp_ipv4_server_and_client();
1462+
unsafe {
1463+
impl_gl_tcp_ipv4_server_and_client();
1464+
}
14611465
}
14621466
#[test]
14631467
fn test_gl_tcp_get_peer_addr() {
1464-
impl_gl_tcp_ipv4_get_peer_addr();
1468+
unsafe {
1469+
impl_gl_tcp_ipv4_get_peer_addr();
1470+
}
14651471
}
14661472
#[test]
14671473
fn test_gl_tcp_ipv4_client_error_connection_refused() {
1468-
impl_gl_tcp_ipv4_client_error_connection_refused();
1474+
unsafe {
1475+
impl_gl_tcp_ipv4_client_error_connection_refused();
1476+
}
14691477
}
14701478
#[test]
14711479
fn test_gl_tcp_server_address_in_use() {
1472-
impl_gl_tcp_ipv4_server_address_in_use();
1480+
unsafe {
1481+
impl_gl_tcp_ipv4_server_address_in_use();
1482+
}
14731483
}
14741484
#[test]
14751485
fn test_gl_tcp_server_access_denied() {
1476-
impl_gl_tcp_ipv4_server_access_denied();
1486+
unsafe {
1487+
impl_gl_tcp_ipv4_server_access_denied();
1488+
}
14771489
}
14781490
// Strange failure on Windows. --pcwalton
14791491
#[test]

0 commit comments

Comments
 (0)