Skip to content

Commit 20148d2

Browse files
borsbors
committed
---
yaml --- r: 139162 b: refs/heads/try2 c: d8c0da3 h: refs/heads/master v: v3
1 parent 70e15ec commit 20148d2

File tree

156 files changed

+4428
-3554
lines changed

Some content is hidden

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

156 files changed

+4428
-3554
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: f9bb7b7768a00a31434952b05ad44202ffad2a11
8+
refs/heads/try2: d8c0da39402818db2d41369826956538ba9672e1
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/mk/platform.mk

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -215,31 +215,31 @@ CFG_LDPATH_i686-apple-darwin :=
215215
CFG_RUN_i686-apple-darwin=$(2)
216216
CFG_RUN_TARG_i686-apple-darwin=$(call CFG_RUN_i686-apple-darwin,,$(2))
217217

218-
# arm-unknown-android configuration
219-
CC_arm-unknown-android=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
220-
CXX_arm-unknown-android=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-g++
221-
CPP_arm-unknown-android=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc -E
222-
AR_arm-unknown-android=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-ar
223-
CFG_LIB_NAME_arm-unknown-android=lib$(1).so
224-
CFG_LIB_GLOB_arm-unknown-android=lib$(1)-*.so
225-
CFG_LIB_DSYM_GLOB_arm-unknown-android=lib$(1)-*.dylib.dSYM
226-
CFG_GCCISH_CFLAGS_arm-unknown-android := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__
227-
CFG_GCCISH_CXXFLAGS_arm-unknown-android := -fno-rtti
228-
CFG_GCCISH_LINK_FLAGS_arm-unknown-android := -shared -fPIC -ldl -g -lm -lsupc++ -lgnustl_shared
229-
CFG_GCCISH_DEF_FLAG_arm-unknown-android := -Wl,--export-dynamic,--dynamic-list=
230-
CFG_GCCISH_PRE_LIB_FLAGS_arm-unknown-android := -Wl,-whole-archive
231-
CFG_GCCISH_POST_LIB_FLAGS_arm-unknown-android := -Wl,-no-whole-archive -Wl,-znoexecstack
232-
CFG_DEF_SUFFIX_arm-unknown-android := .android.def
233-
CFG_INSTALL_NAME_arm-unknown-android =
234-
CFG_LIBUV_LINK_FLAGS_arm-unknown-android =
235-
CFG_EXE_SUFFIX_arm-unknown-android :=
236-
CFG_WINDOWSY_arm-unknown-android :=
237-
CFG_UNIXY_arm-unknown-android := 1
238-
CFG_PATH_MUNGE_arm-unknown-android := true
239-
CFG_LDPATH_arm-unknown-android :=
240-
CFG_RUN_arm-unknown-android=
241-
CFG_RUN_TARG_arm-unknown-android=
242-
RUSTC_FLAGS_arm-unknown-android :=--android-cross-path=$(CFG_ANDROID_CROSS_PATH)
218+
# arm-linux-androideabi configuration
219+
CC_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
220+
CXX_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-g++
221+
CPP_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
222+
AR_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-ar
223+
CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
224+
CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
225+
CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
226+
CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__
227+
CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti
228+
CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++ -lgnustl_shared
229+
CFG_GCCISH_DEF_FLAG_arm-linux-androideabi := -Wl,--export-dynamic,--dynamic-list=
230+
CFG_GCCISH_PRE_LIB_FLAGS_arm-linux-androideabi := -Wl,-whole-archive
231+
CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive -Wl,-znoexecstack
232+
CFG_DEF_SUFFIX_arm-linux-androideabi := .android.def
233+
CFG_INSTALL_NAME_arm-linux-androideabi =
234+
CFG_LIBUV_LINK_FLAGS_arm-linux-androideabi =
235+
CFG_EXE_SUFFIX_arm-linux-androideabi :=
236+
CFG_WINDOWSY_arm-linux-androideabi :=
237+
CFG_UNIXY_arm-linux-androideabi := 1
238+
CFG_PATH_MUNGE_arm-linux-androideabi := true
239+
CFG_LDPATH_arm-linux-androideabi :=
240+
CFG_RUN_arm-linux-androideabi=
241+
CFG_RUN_TARG_arm-linux-androideabi=
242+
RUSTC_FLAGS_arm-linux-androideabi :=--android-cross-path=$(CFG_ANDROID_CROSS_PATH)
243243

244244
# i686-pc-mingw32 configuration
245245
CC_i686-pc-mingw32=$(CC)
@@ -267,22 +267,22 @@ CFG_RUN_i686-pc-mingw32=PATH="$(CFG_LDPATH_i686-pc-mingw32):$(1)" $(2)
267267
CFG_RUN_TARG_i686-pc-mingw32=$(call CFG_RUN_i686-pc-mingw32,$(HLIB$(1)_H_$(CFG_BUILD_TRIPLE)),$(2))
268268

269269
# i586-mingw32msvc configuration
270-
CC_i586-mingw32msvc=$(CC)
271-
CXX_i586-mingw32msvc=$(CXX)
272-
CPP_i586-mingw32msvc=$(CPP)
273-
AR_i586-mingw32msvc=$(AR)
270+
CC_i586-mingw32msvc=$(CFG_MINGW32_CROSS_PATH)/bin/i586-mingw32msvc-gcc
271+
CXX_i586-mingw32msvc=$(CFG_MINGW32_CROSS_PATH)/bin/i586-mingw32msvc-g++
272+
CPP_i586-mingw32msvc=$(CFG_MINGW32_CROSS_PATH)/bin/i586-mingw32msvc-cpp
273+
AR_i586-mingw32msvc=$(CFG_MINGW32_CROSS_PATH)/bin/i586-mingw32msvc-ar
274274
CFG_LIB_NAME_i586-mingw32msvc=$(1).dll
275275
CFG_LIB_GLOB_i586-mingw32msvc=$(1)-*.dll
276276
CFG_LIB_DSYM_GLOB_i586-mingw32msvc=$(1)-*.dylib.dSYM
277-
CFG_GCCISH_CFLAGS_i586-mingw32msvc := -Wall -Werror -g -march=586 -m32
277+
CFG_GCCISH_CFLAGS_i586-mingw32msvc := -Wall -Werror -g -march=i586 -m32
278278
CFG_GCCISH_CXXFLAGS_i586-mingw32msvc := -fno-rtti
279279
CFG_GCCISH_LINK_FLAGS_i586-mingw32msvc := -shared -g -m32
280280
CFG_GCCISH_DEF_FLAG_i586-mingw32msvc :=
281281
CFG_GCCISH_PRE_LIB_FLAGS_i586-mingw32msvc :=
282282
CFG_GCCISH_POST_LIB_FLAGS_i586-mingw32msvc :=
283283
CFG_DEF_SUFFIX_i586-mingw32msvc := .mingw32.def
284284
CFG_INSTALL_NAME_i586-mingw32msvc =
285-
CFG_LIBUV_LINK_FLAGS_i586-mingw32msvc := -lWs2_32 -lpsapi -liphlpapi
285+
CFG_LIBUV_LINK_FLAGS_i586-mingw32msvc := -L$(CFG_MINGW32_CROSS_PATH)/i586-mingw32msvc/lib -lws2_32 -lpsapi -liphlpapi
286286
CFG_EXE_SUFFIX_i586-mingw32msvc := .exe
287287
CFG_WINDOWSY_i586-mingw32msvc := 1
288288
CFG_UNIXY_i586-mingw32msvc :=
@@ -342,7 +342,7 @@ define CFG_MAKE_TOOLCHAIN
342342
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
343343
$$(call CFG_INSTALL_NAME_$(1),$$(4))
344344

345-
ifneq ($(1),arm-unknown-android)
345+
ifneq ($(1),arm-linux-androideabi)
346346

347347
# We're using llvm-mc as our assembler because it supports
348348
# .cfi pseudo-ops on mac
@@ -356,7 +356,7 @@ define CFG_MAKE_TOOLCHAIN
356356

357357
# For the Android cross, use the Android assembler
358358
# XXX: We should be able to use the LLVM assembler
359-
CFG_ASSEMBLE_$(1)=$$(CXX_$(1)) $$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)
359+
CFG_ASSEMBLE_$(1)=$$(CPP_$(1)) $$(CFG_DEPEND_FLAGS) $$(2) -c -o $$(1)
360360

361361
endif
362362

‎branches/try2/mk/rt.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ else ifeq ($(OSTYPE_$(1)), apple-darwin)
9292
else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
9393
LIBUV_OSTYPE_$(1) := unix/freebsd
9494
LIBUV_LIB_$(1) := rt/$(1)/libuv/libuv.a
95-
else ifeq ($(OSTYPE_$(1)), unknown-android)
95+
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
9696
LIBUV_OSTYPE_$(1) := unix/android
9797
LIBUV_LIB_$(1) := rt/$(1)/libuv/libuv.a
9898
else
@@ -164,7 +164,7 @@ $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
164164
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
165165
OS=mingw \
166166
V=$$(VERBOSE)
167-
else ifeq ($(OSTYPE_$(1)), unknown-android)
167+
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
168168
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
169169
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
170170
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \

‎branches/try2/src/compiletest/errors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ fn parse_expected(line_num: uint, line: ~str) -> ~[ExpectedError] {
5151
while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
5252
let start_kind = idx;
5353
while idx < len && line[idx] != (' ' as u8) { idx += 1u; }
54-
let kind = str::to_lower(str::slice(line, start_kind, idx));
54+
let kind = str::to_lower(str::slice(line, start_kind, idx).to_owned());
5555

5656
// Extract msg:
5757
while idx < len && line[idx] == (' ' as u8) { idx += 1u; }
58-
let msg = str::slice(line, idx, len);
58+
let msg = str::slice(line, idx, len).to_owned();
5959

6060
debug!("line=%u kind=%s msg=%s", line_num - adjust_line, kind, msg);
6161

‎branches/try2/src/compiletest/header.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ fn parse_name_value_directive(line: ~str,
175175
match str::find_str(line, keycolon) {
176176
Some(colon) => {
177177
let value = str::slice(line, colon + str::len(keycolon),
178-
str::len(line));
178+
str::len(line)).to_owned();
179179
debug!("%s: %s", directive, value);
180180
Some(value)
181181
}

‎branches/try2/src/compiletest/runtest.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,18 +208,19 @@ actual:\n\
208208
testfile: &Path, src: ~str) -> ProcRes {
209209
compose_and_run_compiler(
210210
config, props, testfile,
211-
make_typecheck_args(config, testfile),
211+
make_typecheck_args(config, props, testfile),
212212
Some(src))
213213
}
214214

215-
fn make_typecheck_args(config: config, testfile: &Path) -> ProcArgs {
215+
fn make_typecheck_args(config: config, props: TestProps, testfile: &Path) -> ProcArgs {
216216
let prog = config.rustc_path;
217217
let mut args = ~[~"-",
218218
~"--no-trans", ~"--lib",
219219
~"-L", config.build_base.to_str(),
220220
~"-L",
221221
aux_output_dir_name(config, testfile).to_str()];
222222
args += split_maybe_args(config.rustcflags);
223+
args += split_maybe_args(props.compile_flags);
223224
return ProcArgs {prog: prog.to_str(), args: args};
224225
}
225226
}

‎branches/try2/src/etc/x86.supp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,21 @@
451451
fun:*uv_loop_delete*
452452
}
453453

454+
{
455+
race-or-something-ask-pcwalton-0
456+
Memcheck:Value4
457+
fun:*task_start_wrapper*
458+
...
459+
}
460+
461+
{
462+
race-or-something-ask-pcwalton-1
463+
Memcheck:Value4
464+
...
465+
fun:*build_start_wrapper*
466+
...
467+
}
468+
454469
{
455470
lock_and_signal-probably-threadsafe-access-outside-of-lock
456471
Helgrind:Race

‎branches/try2/src/libcore/char.rs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -288,16 +288,16 @@ fn test_is_whitespace() {
288288

289289
#[test]
290290
fn test_to_digit() {
291-
fail_unless!(to_digit('0', 10u) == Some(0u));
292-
fail_unless!(to_digit('1', 2u) == Some(1u));
293-
fail_unless!(to_digit('2', 3u) == Some(2u));
294-
fail_unless!(to_digit('9', 10u) == Some(9u));
295-
fail_unless!(to_digit('a', 16u) == Some(10u));
296-
fail_unless!(to_digit('A', 16u) == Some(10u));
297-
fail_unless!(to_digit('b', 16u) == Some(11u));
298-
fail_unless!(to_digit('B', 16u) == Some(11u));
299-
fail_unless!(to_digit('z', 36u) == Some(35u));
300-
fail_unless!(to_digit('Z', 36u) == Some(35u));
291+
assert_eq!(to_digit('0', 10u), Some(0u));
292+
assert_eq!(to_digit('1', 2u), Some(1u));
293+
assert_eq!(to_digit('2', 3u), Some(2u));
294+
assert_eq!(to_digit('9', 10u), Some(9u));
295+
assert_eq!(to_digit('a', 16u), Some(10u));
296+
assert_eq!(to_digit('A', 16u), Some(10u));
297+
assert_eq!(to_digit('b', 16u), Some(11u));
298+
assert_eq!(to_digit('B', 16u), Some(11u));
299+
assert_eq!(to_digit('z', 36u), Some(35u));
300+
assert_eq!(to_digit('Z', 36u), Some(35u));
301301

302302
fail_unless!(to_digit(' ', 10u).is_none());
303303
fail_unless!(to_digit('$', 36u).is_none());
@@ -321,28 +321,28 @@ fn test_is_digit() {
321321
322322
#[test]
323323
fn test_escape_default() {
324-
fail_unless!(escape_default('\n') == ~"\\n");
325-
fail_unless!(escape_default('\r') == ~"\\r");
326-
fail_unless!(escape_default('\'') == ~"\\'");
327-
fail_unless!(escape_default('"') == ~"\\\"");
328-
fail_unless!(escape_default(' ') == ~" ");
329-
fail_unless!(escape_default('a') == ~"a");
330-
fail_unless!(escape_default('~') == ~"~");
331-
fail_unless!(escape_default('\x00') == ~"\\x00");
332-
fail_unless!(escape_default('\x1f') == ~"\\x1f");
333-
fail_unless!(escape_default('\x7f') == ~"\\x7f");
334-
fail_unless!(escape_default('\xff') == ~"\\xff");
335-
fail_unless!(escape_default('\u011b') == ~"\\u011b");
336-
fail_unless!(escape_default('\U0001d4b6') == ~"\\U0001d4b6");
324+
assert_eq!(escape_default('\n'), ~"\\n");
325+
assert_eq!(escape_default('\r'), ~"\\r");
326+
assert_eq!(escape_default('\''), ~"\\'");
327+
assert_eq!(escape_default('"'), ~"\\\"");
328+
assert_eq!(escape_default(' '), ~" ");
329+
assert_eq!(escape_default('a'), ~"a");
330+
assert_eq!(escape_default('~'), ~"~");
331+
assert_eq!(escape_default('\x00'), ~"\\x00");
332+
assert_eq!(escape_default('\x1f'), ~"\\x1f");
333+
assert_eq!(escape_default('\x7f'), ~"\\x7f");
334+
assert_eq!(escape_default('\xff'), ~"\\xff");
335+
assert_eq!(escape_default('\u011b'), ~"\\u011b");
336+
assert_eq!(escape_default('\U0001d4b6'), ~"\\U0001d4b6");
337337
}
338338
339339
340340
#[test]
341341
fn test_escape_unicode() {
342-
fail_unless!(escape_unicode('\x00') == ~"\\x00");
343-
fail_unless!(escape_unicode('\n') == ~"\\x0a");
344-
fail_unless!(escape_unicode(' ') == ~"\\x20");
345-
fail_unless!(escape_unicode('a') == ~"\\x61");
346-
fail_unless!(escape_unicode('\u011b') == ~"\\u011b");
347-
fail_unless!(escape_unicode('\U0001d4b6') == ~"\\U0001d4b6");
342+
assert_eq!(escape_unicode('\x00'), ~"\\x00");
343+
assert_eq!(escape_unicode('\n'), ~"\\x0a");
344+
assert_eq!(escape_unicode(' '), ~"\\x20");
345+
assert_eq!(escape_unicode('a'), ~"\\x61");
346+
assert_eq!(escape_unicode('\u011b'), ~"\\u011b");
347+
assert_eq!(escape_unicode('\U0001d4b6'), ~"\\U0001d4b6");
348348
}

‎branches/try2/src/libcore/cmp.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ pub pure fn max<T:Ord>(v1: T, v2: T) -> T {
172172
mod test {
173173
#[test]
174174
fn test_int() {
175-
fail_unless!(5.cmp(&10) == Less);
176-
fail_unless!(10.cmp(&5) == Greater);
177-
fail_unless!(5.cmp(&5) == Equal);
178-
fail_unless!((-5).cmp(&12) == Less);
179-
fail_unless!(12.cmp(-5) == Greater);
175+
assert_eq!(5.cmp(&10), Less);
176+
assert_eq!(10.cmp(&5), Greater);
177+
assert_eq!(5.cmp(&5), Equal);
178+
assert_eq!((-5).cmp(&12), Less);
179+
assert_eq!(12.cmp(-5), Greater);
180180
}
181181
}

‎branches/try2/src/libcore/comm.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ pub fn stream<T:Owned>() -> (Port<T>, Chan<T>) {
110110
// required.
111111
#[cfg(stage1)]
112112
#[cfg(stage2)]
113+
#[cfg(stage3)]
113114
pub impl<T: Owned> Chan<T> {
114115
fn send(&self, x: T) { chan_send(self, x) }
115116
fn try_send(&self, x: T) -> bool { chan_try_send(self, x) }
@@ -149,6 +150,7 @@ fn chan_try_send<T:Owned>(self: &Chan<T>, x: T) -> bool {
149150
// Use an inherent impl so that imports are not required:
150151
#[cfg(stage1)]
151152
#[cfg(stage2)]
153+
#[cfg(stage3)]
152154
pub impl<T: Owned> Port<T> {
153155
fn recv(&self) -> T { port_recv(self) }
154156
fn try_recv(&self) -> Option<T> { port_try_recv(self) }
@@ -226,6 +228,7 @@ pub fn PortSet<T: Owned>() -> PortSet<T>{
226228
// Use an inherent impl so that imports are not required:
227229
#[cfg(stage1)]
228230
#[cfg(stage2)]
231+
#[cfg(stage3)]
229232
pub impl<T:Owned> PortSet<T> {
230233
fn recv(&self) -> T { port_set_recv(self) }
231234
fn try_recv(&self) -> Option<T> { port_set_try_recv(self) }
@@ -301,6 +304,7 @@ pub type SharedChan<T> = unstable::Exclusive<Chan<T>>;
301304
302305
#[cfg(stage1)]
303306
#[cfg(stage2)]
307+
#[cfg(stage3)]
304308
pub impl<T: Owned> SharedChan<T> {
305309
fn send(&self, x: T) { shared_chan_send(self, x) }
306310
fn try_send(&self, x: T) -> bool { shared_chan_try_send(self, x) }

0 commit comments

Comments
 (0)