Skip to content

Commit bc6d110

Browse files
brsonemberian
brson
authored and
emberian
committed
---
yaml --- r: 63026 b: refs/heads/snap-stage3 c: 829b5de h: refs/heads/master v: v3
1 parent c37a15f commit bc6d110

File tree

448 files changed

+48940
-6290
lines changed

Some content is hidden

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

448 files changed

+48940
-6290
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: 1ebb62f591c078294762e1124357d74d21a66974
4+
refs/heads/snap-stage3: 829b5de9988fa71a7a585df5b9c46ea07e05a431
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
src/rt/msvc/* -whitespace
88
src/rt/vg/* -whitespace
99
src/rt/linenoise/* -whitespace
10+
src/rt/jemalloc/**/* -whitespace

‎branches/snap-stage3/.mailmap

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎branches/snap-stage3/CONTRIBUTING.md

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,27 @@
11
## Pull request procedure
22

3-
Pull requests should be targeted at Rust's `incoming` branch (note
4-
that by default Github will aim them at the `master` branch) -- see
5-
"Changing The Commit Range and Destination Repository" in Github's
6-
documentation on [pull
7-
requests](https://help.github.com/articles/using-pull-requests).
8-
Before pushing to your Github repo and issuing the pull request,
9-
please do two things:
3+
Pull requests should be targeted at Rust's `incoming` branch (note that by default Github will aim them at the `master` branch) --
4+
see "Changing The Commit Range and Destination Repository" in Github's documentation on [pull requests](https://help.github.com/articles/using-pull-requests).
5+
Before pushing to your Github repo and issuing the pull request, please do two things:
106

11-
1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your
12-
local changes against the `incoming` branch. Resolve any conflicts
13-
that arise.
7+
1. [Rebase](http://git-scm.com/book/en/Git-Branching-Rebasing) your local changes against the `incoming` branch. Resolve any conflicts that arise.
8+
2. Run the full Rust test suite with the `make check` command.
9+
You're not off the hook even if you just stick to documentation; code examples in the docs are tested as well!
1410

15-
2. Run the full Rust test suite with the `make check` command. You're
16-
not off the hook even if you just stick to documentation; code
17-
examples in the docs are tested as well!
11+
Pull requests will be treated as "review requests",
12+
and we will give feedback we expect to see corrected on [style](https://github.com/mozilla/rust/wiki/Note-style-guide) and substance before pulling.
13+
Changes contributed via pull request should focus on a single issue at a time, like any other.
14+
We will not accept pull-requests that try to "sneak" unrelated changes in.
1815

19-
Pull requests will be treated as "review requests", and we will give
20-
feedback we expect to see corrected on
21-
[style](https://github.com/mozilla/rust/wiki/Note-style-guide) and
22-
substance before pulling. Changes contributed via pull request should
23-
focus on a single issue at a time, like any other. We will not accept
24-
pull-requests that try to "sneak" unrelated changes in.
16+
Normally, all pull requests must include regression tests (see [Note-testsuite](https://github.com/mozilla/rust/wiki/Note-testsuite)) that test your change.
17+
Occasionally, a change will be very difficult to test for.
18+
In those cases, please include a note in your commit message explaining why.
2519

26-
Normally, all pull requests must include regression tests (see
27-
[Note-testsuite](https://github.com/mozilla/rust/wiki/Note-testsuite))
28-
that test your change. Occasionally, a change will be very difficult
29-
to test for. In those cases, please include a note in your commit
30-
message explaining why.
31-
32-
In the licensing header at the beginning of any files you change,
33-
please make sure the listed date range includes the current year. For
34-
example, if it's 2013, and you change a Rust file that was created in
35-
2010, it should begin:
20+
In the licensing header at the beginning of any files you change, please make sure the listed date range includes the current year.
21+
For example, if it's 2013, and you change a Rust file that was created in 2010, it should begin:
3622

3723
```
3824
// Copyright 2010-2013 The Rust Project Developers.
3925
```
4026

41-
For more details, please refer to
42-
[Note-development-policy](https://github.com/mozilla/rust/wiki/Note-development-policy).
27+
For more details, please refer to [Note-development-policy](https://github.com/mozilla/rust/wiki/Note-development-policy).

‎branches/snap-stage3/configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,8 @@ do
683683
for i in \
684684
isaac linenoise sync test \
685685
arch/i386 arch/x86_64 arch/arm arch/mips \
686-
libuv libuv/src/ares libuv/src/eio libuv/src/ev
686+
libuv libuv/src/ares libuv/src/eio libuv/src/ev \
687+
jemalloc
687688
do
688689
make_dir rt/$t/stage$s/$i
689690
done

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2325,9 +2325,7 @@ An example of a for loop over the contents of a vector:
23252325
~~~~
23262326
# type foo = int;
23272327
# fn bar(f: foo) { }
2328-
# let a = 0;
2329-
# let b = 0;
2330-
# let c = 0;
2328+
# let a = 0, b = 0, c = 0;
23312329
23322330
let v: &[foo] = &[a, b, c];
23332331
@@ -3002,7 +3000,7 @@ allocated within the stack's memory. The value is a part of the stack frame.
30023000

30033001
Local variables are immutable unless declared with `let mut`. The
30043002
`mut` keyword applies to all local variables declared within that
3005-
declaration (so `let mut (x, y) = ...` declares two mutable variables, `x` and
3003+
declaration (so `let mut x, y` declares two mutable variables, `x` and
30063004
`y`).
30073005

30083006
Function parameters are immutable unless declared with `mut`. The

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@ or the equivalent on Windows.
3030

3131
Each workspace may contain one or more packages.
3232

33-
When building code that contains one or more directives of the form `extern mod P`,
34-
rustpkg automatically searches for packages named `P` in the `RUST_PATH` (as described above).
35-
It builds those dependencies if necessary.
36-
Thus, when using rustpkg,
37-
there is no need for `-L` flags to tell the linker where to find libraries for external crates.
38-
3933
# Package structure
4034

4135
A valid workspace must contain each of the following subdirectories:
@@ -72,10 +66,6 @@ A package can be stored in a workspace on the local file system,
7266
or on a remote Web server, in which case the package ID resembles a URL.
7367
For example, `github.com/mozilla/rust` is a package ID
7468
that would refer to the git repository browsable at `http://github.com/mozilla/rust`.
75-
A package ID can also specify a version, like:
76-
`github.com/mozilla/rust#0.3`.
77-
In this case, `rustpkg` will check that the repository `github.com/mozilla/rust` has a tag named `0.3`,
78-
and report an error otherwise.
7969

8070
## Source files
8171

@@ -86,15 +76,6 @@ rustpkg searches for four different fixed filenames in order to determine the cr
8676
* `test.rs`: Assumed to contain tests declared with the `#[test]` attribute.
8777
* `bench.rs`: Assumed to contain benchmarks declared with the `#[bench]` attribute.
8878

89-
## Versions
90-
91-
`rustpkg` packages do not need to declare their versions with an attribute inside one of the source files,
92-
because `rustpkg` infers it from the version control system.
93-
When building a package that is in a `git` repository,
94-
`rustpkg` assumes that the most recent tag specifies the current version.
95-
When building a package that is not under version control,
96-
or that has no tags, `rustpkg` assumes the intended version is 0.1.
97-
9879
# Custom build scripts
9980

10081
A file called `pkg.rs` at the root level in a workspace is called a *package script*.

‎branches/snap-stage3/doc/tutorial-ffi.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ pub struct Unique<T> {
159159
priv ptr: *mut T
160160
}
161161
162-
impl<T: Owned> Unique<T> {
163-
pub fn new(value: T) -> Unique<T> {
162+
pub impl<T: Owned> Unique<T> {
163+
fn new(value: T) -> Unique<T> {
164164
unsafe {
165165
let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;
166166
assert!(!ptr::is_null(ptr));
@@ -171,12 +171,12 @@ impl<T: Owned> Unique<T> {
171171
}
172172
173173
// the 'r lifetime results in the same semantics as `&*x` with ~T
174-
pub fn borrow<'r>(&'r self) -> &'r T {
174+
fn borrow<'r>(&'r self) -> &'r T {
175175
unsafe { cast::copy_lifetime(self, &*self.ptr) }
176176
}
177177
178178
// the 'r lifetime results in the same semantics as `&mut *x` with ~T
179-
pub fn borrow_mut<'r>(&'r mut self) -> &'r mut T {
179+
fn borrow_mut<'r>(&'r mut self) -> &'r mut T {
180180
unsafe { cast::copy_mut_lifetime(self, &mut *self.ptr) }
181181
}
182182
}

‎branches/snap-stage3/doc/tutorial-macros.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ doing nothing otherwise:
1313
~~~~
1414
# enum t { special_a(uint), special_b(uint) };
1515
# fn f() -> uint {
16-
# let input_1 = special_a(0);
17-
# let input_2 = special_a(0);
16+
# let input_1 = special_a(0), input_2 = special_a(0);
1817
match input_1 {
1918
special_a(x) => { return x; }
2019
_ => {}
@@ -39,8 +38,7 @@ the pattern in the above code:
3938
~~~~
4039
# enum t { special_a(uint), special_b(uint) };
4140
# fn f() -> uint {
42-
# let input_1 = special_a(0);
43-
# let input_2 = special_a(0);
41+
# let input_1 = special_a(0), input_2 = special_a(0);
4442
macro_rules! early_return(
4543
($inp:expr $sp:ident) => ( // invoke it like `(input_5 special_e)`
4644
match $inp {
@@ -157,8 +155,7 @@ instead of `*` to mean "at least one".
157155
~~~~
158156
# enum t { special_a(uint),special_b(uint),special_c(uint),special_d(uint)};
159157
# fn f() -> uint {
160-
# let input_1 = special_a(0);
161-
# let input_2 = special_a(0);
158+
# let input_1 = special_a(0), input_2 = special_a(0);
162159
macro_rules! early_return(
163160
($inp:expr, [ $($sp:ident)|+ ]) => (
164161
match $inp {

‎branches/snap-stage3/mk/platform.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ CFG_LIB_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.so
146146
CFG_LIB_DSYM_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
147147
CFG_GCCISH_CFLAGS_x86_64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64
148148
CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti
149-
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -lpthread -lrt -g -m64
149+
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m64
150150
CFG_GCCISH_DEF_FLAG_x86_64-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
151151
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-whole-archive
152152
CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-no-whole-archive
@@ -172,7 +172,7 @@ CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
172172
CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
173173
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32
174174
CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti
175-
CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -lpthread -lrt -g -m32
175+
CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32
176176
CFG_GCCISH_DEF_FLAG_i686-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
177177
CFG_GCCISH_PRE_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-whole-archive
178178
CFG_GCCISH_POST_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-no-whole-archive
@@ -198,7 +198,7 @@ CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
198198
CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
199199
CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64
200200
CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti
201-
CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind -m64
201+
CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread -framework CoreServices -Wl,-no_compact_unwind -m64
202202
CFG_GCCISH_DEF_FLAG_x86_64-apple-darwin := -Wl,-exported_symbols_list,
203203
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-apple-darwin :=
204204
CFG_GCCISH_POST_LIB_FLAGS_x86_64-apple-darwin :=
@@ -223,7 +223,7 @@ CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
223223
CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
224224
CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386
225225
CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti
226-
CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -lpthread -framework CoreServices -Wl,-no_compact_unwind -m32
226+
CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread -framework CoreServices -Wl,-no_compact_unwind -m32
227227
CFG_GCCISH_DEF_FLAG_i686-apple-darwin := -Wl,-exported_symbols_list,
228228
CFG_GCCISH_PRE_LIB_FLAGS_i686-apple-darwin :=
229229
CFG_GCCISH_POST_LIB_FLAGS_i686-apple-darwin :=
@@ -376,13 +376,13 @@ CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
376376
CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
377377
CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM
378378
CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include
379-
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -lpthread -lrt
379+
CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread -lrt
380380
CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=
381381
CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-whole-archive
382382
CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-no-whole-archive
383383
CFG_DEF_SUFFIX_x86_64-unknown-freebsd := .bsd.def
384384
CFG_INSTALL_NAME_x86_64-unknown-freebsd =
385-
CFG_LIBUV_LINK_FLAGS_x86_64-unknown-freebsd := -lpthread -lkvm
385+
CFG_LIBUV_LINK_FLAGS_x86_64-unknown-freebsd := -pthread -lkvm
386386
CFG_EXE_SUFFIX_x86_64-unknown-freebsd :=
387387
CFG_WINDOWSY_x86_64-unknown-freebsd :=
388388
CFG_UNIXY_x86_64-unknown-freebsd := 1

‎branches/snap-stage3/mk/rt.mk

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,23 @@ RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
9797
ifeq ($$(CFG_WINDOWSY_$(1)), 1)
9898
LIBUV_OSTYPE_$(1)_$(2) := win
9999
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
100+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/jemalloc.lib
100101
else ifeq ($(OSTYPE_$(1)), apple-darwin)
101102
LIBUV_OSTYPE_$(1)_$(2) := mac
102103
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
104+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
103105
else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
104106
LIBUV_OSTYPE_$(1)_$(2) := unix/freebsd
105107
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
108+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
106109
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
107110
LIBUV_OSTYPE_$(1)_$(2) := unix/android
108111
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
112+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
109113
else
110114
LIBUV_OSTYPE_$(1)_$(2) := unix/linux
111115
LIBUV_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/libuv/libuv.a
116+
JEMALLOC_LIB_$(1)_$(2) := rt/$(1)/stage$(2)/jemalloc/lib/libjemalloc_pic.a
112117
endif
113118

114119
RUNTIME_DEF_$(1)_$(2) := rt/rustrt$(CFG_DEF_SUFFIX_$(1))
@@ -124,8 +129,6 @@ ALL_OBJ_FILES += $$(RUNTIME_OBJS_$(1)_$(2))
124129
MORESTACK_OBJ_$(1)_$(2) := rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/morestack.o
125130
ALL_OBJ_FILES += $$(MORESTACK_OBJS_$(1)_$(2))
126131

127-
RUNTIME_LIBS_$(1)_$(2) := $$(LIBUV_LIB_$(1)_$(2))
128-
129132
rt/$(1)/stage$(2)/%.o: rt/%.cpp $$(MKFILE_DEPS)
130133
@$$(call E, compile: $$@)
131134
$$(Q)$$(call CFG_COMPILE_CXX_$(1), $$@, $$(RUNTIME_INCS_$(1)_$(2)) \
@@ -146,11 +149,10 @@ rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
146149
$$(Q)$(AR_$(1)) rcs $$@ $$<
147150

148151
rt/$(1)/stage$(2)/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
149-
$$(RUNTIME_DEF_$(1)_$(2)) \
150-
$$(RUNTIME_LIBS_$(1)_$(2))
152+
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1)_$(2)) $$(JEMALLOC_LIB_$(1)_$(2))
151153
@$$(call E, link: $$@)
152154
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)_$(2)) \
153-
$$(CFG_GCCISH_POST_LIB_FLAGS_$(1)) $$(RUNTIME_LIBS_$(1)_$(2)) \
155+
$$(JEMALLOC_LIB_$(1)_$(2)) $$(CFG_GCCISH_POST_LIB_FLAGS_$(1)) $$(LIBUV_LIB_$(1)_$(2)) \
154156
$$(CFG_LIBUV_LINK_FLAGS_$(1)),$$(RUNTIME_DEF_$(1)_$(2)),$$(CFG_RUNTIME_$(1)))
155157

156158
# FIXME: For some reason libuv's makefiles can't figure out the
@@ -199,6 +201,9 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
199201
V=$$(VERBOSE)
200202
endif
201203

204+
$$(JEMALLOC_LIB_$(1)_$(2)):
205+
cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure --disable-experimental
206+
$$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc
202207

203208
# These could go in rt.mk or rustllvm.mk, they're needed for both.
204209

‎branches/snap-stage3/mk/tests.mk

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,8 @@ CFG_ADB_TEST_DIR=/data/tmp
122122
$(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \
123123
$(shell adb remount 1>/dev/null) \
124124
$(shell adb shell mkdir $(CFG_ADB_TEST_DIR) 1>/dev/null) \
125-
$(shell adb shell rm $(CFG_ADB_TEST_DIR)/*.so 1>/dev/null) \
126-
$(shell adb shell rm $(CFG_ADB_TEST_DIR)/*-arm-linux-androideabi 1>/dev/null) \
127-
$(shell adb shell rm $(CFG_ADB_TEST_DIR)/*-arm-linux-androideabi.* 1>/dev/null) \
128-
$(shell adb push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \
129125
$(shell adb push $(CFG_ANDROID_CROSS_PATH)/arm-linux-androideabi/lib/armv7-a/libgnustl_shared.so \
130126
$(CFG_ADB_TEST_DIR) 1>/dev/null) \
131-
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD_TRIPLE))/$(CFG_RUNTIME_arm-linux-androideabi) \
132-
$(CFG_ADB_TEST_DIR)) \
133-
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD_TRIPLE))/$(STDLIB_GLOB_arm-linux-androideabi) \
134-
$(CFG_ADB_TEST_DIR)) \
135-
$(shell adb push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD_TRIPLE))/$(EXTRALIB_GLOB_arm-linux-androideabi) \
136-
$(CFG_ADB_TEST_DIR)) \
137127
)
138128
else
139129
CFG_ADB_TEST_DIR=

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ pub fn make_test_name(config: &config, testfile: &Path) -> test::TestName {
260260

261261
pub fn make_test_closure(config: &config, testfile: &Path) -> test::TestFn {
262262
use core::cell::Cell;
263-
let config = Cell::new(copy *config);
264-
let testfile = Cell::new(testfile.to_str());
263+
let config = Cell(copy *config);
264+
let testfile = Cell(testfile.to_str());
265265
test::DynTestFn(|| { runtest::run(config.take(), testfile.take()) })
266266
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use core::os;
1717
use core::run;
1818
use core::str;
1919
use core::task;
20+
use core::vec;
2021

2122
#[cfg(target_os = "win32")]
2223
fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
@@ -28,7 +29,7 @@ fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
2829
let aux_path = prog.slice(0u, prog.len() - 4u).to_owned() + ".libaux";
2930

3031
env = do vec::map(env) |pair| {
31-
let (k,v) = *pair;
32+
let (k,v) = copy *pair;
3233
if k == ~"PATH" { (~"PATH", v + ";" + lib_path + ";" + aux_path) }
3334
else { (k,v) }
3435
};

0 commit comments

Comments
 (0)