Skip to content

Commit e557feb

Browse files
borsbors
committed
---
yaml --- r: 152869 b: refs/heads/try2 c: b20f968 h: refs/heads/master i: 152867: efa427e v: v3
1 parent 1380e35 commit e557feb

File tree

587 files changed

+8946
-6361
lines changed

Some content is hidden

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

587 files changed

+8946
-6361
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: c3c195bd48ef10849eb0f76aa5d383401e57014d
8+
refs/heads/try2: b20f968ed2a4808f98ffce52ce95398009565ece
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,14 +869,14 @@ do
869869
make_dir $h/test/debuginfo-lldb
870870
make_dir $h/test/codegen
871871
make_dir $h/test/doc-tutorial
872+
make_dir $h/test/doc-guide
872873
make_dir $h/test/doc-guide-ffi
873874
make_dir $h/test/doc-guide-runtime
874875
make_dir $h/test/doc-guide-macros
875876
make_dir $h/test/doc-guide-lifetimes
876877
make_dir $h/test/doc-guide-pointers
877878
make_dir $h/test/doc-guide-container
878879
make_dir $h/test/doc-guide-tasks
879-
make_dir $h/test/doc-complement-cheatsheet
880880
make_dir $h/test/doc-rust
881881
done
882882

‎branches/try2/mk/docs.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
# L10N_LANGS are the languages for which the docs have been
2727
# translated.
2828
######################################################################
29-
DOCS := index intro tutorial guide-ffi guide-macros guide-lifetimes \
29+
DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
3030
guide-tasks guide-container guide-pointers guide-testing \
31-
guide-runtime complement-bugreport complement-cheatsheet \
31+
guide-runtime complement-bugreport \
3232
complement-lang-faq complement-design-faq complement-project-faq rust \
3333
rustdoc guide-unsafe
3434

‎branches/try2/mk/main.mk

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ SPACE :=
4242
SPACE +=
4343
ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT))),)
4444
ifneq ($(wildcard $(subst $(SPACE),\$(SPACE),$(CFG_GIT_DIR))),)
45-
CFG_VERSION += $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 \
46-
--pretty=format:'(%h %ci)')
45+
CFG_VER_DATE = $(shell git --git-dir='$(CFG_GIT_DIR)' log -1 --pretty=format:'%ci')
4746
CFG_VER_HASH = $(shell git --git-dir='$(CFG_GIT_DIR)' rev-parse HEAD)
47+
CFG_VERSION += ($(CFG_VER_HASH) $(CFG_VER_DATE))
4848
endif
4949
endif
5050

@@ -272,6 +272,12 @@ $(foreach host,$(CFG_HOST), \
272272

273273
export CFG_SRC_DIR
274274
export CFG_BUILD_DIR
275+
ifdef CFG_VER_DATE
276+
export CFG_VER_DATE
277+
endif
278+
ifdef CFG_VER_HASH
279+
export CFG_VER_HASH
280+
endif
275281
export CFG_VERSION
276282
export CFG_VERSION_WIN
277283
export CFG_RELEASE

‎branches/try2/mk/platform.mk

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,36 @@ CFG_RUN_TARG_arm-unknown-linux-gnueabi=$(call CFG_RUN_arm-unknown-linux-gnueabi,
374374
RUSTC_FLAGS_arm-unknown-linux-gnueabi :=
375375
RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi :=
376376

377+
# mipsel-linux configuration
378+
CC_mipsel-linux=mipsel-linux-gcc
379+
CXX_mipsel-linux=mipsel-linux-g++
380+
CPP_mipsel-linux=mipsel-linux-gcc
381+
AR_mipsel-linux=mipsel-linux-ar
382+
CFG_LIB_NAME_mipsel-linux=lib$(1).so
383+
CFG_STATIC_LIB_NAME_mipsel-linux=lib$(1).a
384+
CFG_LIB_GLOB_mipsel-linux=lib$(1)-*.so
385+
CFG_LIB_DSYM_GLOB_mipsel-linux=lib$(1)-*.dylib.dSYM
386+
CFG_CFLAGS_mipsel-linux := -mips32 -mabi=32 $(CFLAGS)
387+
CFG_GCCISH_CFLAGS_mipsel-linux := -Wall -g -fPIC -mips32 -mabi=32 $(CFLAGS)
388+
CFG_GCCISH_CXXFLAGS_mipsel-linux := -fno-rtti $(CXXFLAGS)
389+
CFG_GCCISH_LINK_FLAGS_mipsel-linux := -shared -fPIC -g -mips32
390+
CFG_GCCISH_DEF_FLAG_mipsel-linux := -Wl,--export-dynamic,--dynamic-list=
391+
CFG_GCCISH_PRE_LIB_FLAGS_mipsel-linux := -Wl,-whole-archive
392+
CFG_GCCISH_POST_LIB_FLAGS_mipsel-linux := -Wl,-no-whole-archive
393+
CFG_DEF_SUFFIX_mipsel-linux := .linux.def
394+
CFG_LLC_FLAGS_mipsel-linux :=
395+
CFG_INSTALL_NAME_mipsel-linux =
396+
CFG_LIBUV_LINK_FLAGS_mipsel-linux =
397+
CFG_EXE_SUFFIX_mipsel-linux :=
398+
CFG_WINDOWSY_mipsel-linux :=
399+
CFG_UNIXY_mipsel-linux := 1
400+
CFG_PATH_MUNGE_mipsel-linux := true
401+
CFG_LDPATH_mipsel-linux :=
402+
CFG_RUN_mipsel-linux=
403+
CFG_RUN_TARG_mipsel-linux=
404+
RUSTC_FLAGS_mipsel-linux := -C target-cpu=mips32 -C target-feature="+mips32,+o32"
405+
406+
377407
# mips-unknown-linux-gnu configuration
378408
CC_mips-unknown-linux-gnu=mips-linux-gnu-gcc
379409
CXX_mips-unknown-linux-gnu=mips-linux-gnu-g++
@@ -612,7 +642,7 @@ define CFG_MAKE_TOOLCHAIN
612642
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
613643
$$(call CFG_INSTALL_NAME_$(1),$$(4))
614644

615-
ifeq ($$(findstring $(HOST_$(1)),arm mips),)
645+
ifeq ($$(findstring $(HOST_$(1)),arm mips mipsel),)
616646

617647
# We're using llvm-mc as our assembler because it supports
618648
# .cfi pseudo-ops on mac

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

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ fn start(argc: int, argv: **u8) -> int {
4848

4949
pub fn main() {
5050
let args = os::args();
51-
let config = parse_config(args.move_iter()
52-
.map(|x| x.to_string())
53-
.collect());
51+
let config = parse_config(args);
5452
log_config(&config);
5553
run_tests(&config);
5654
}
@@ -131,17 +129,15 @@ pub fn parse_config(args: Vec<String> ) -> Config {
131129
};
132130

133131
Config {
134-
compile_lib_path: matches.opt_str("compile-lib-path")
135-
.unwrap()
136-
.to_string(),
137-
run_lib_path: matches.opt_str("run-lib-path").unwrap().to_string(),
132+
compile_lib_path: matches.opt_str("compile-lib-path").unwrap(),
133+
run_lib_path: matches.opt_str("run-lib-path").unwrap(),
138134
rustc_path: opt_path(matches, "rustc-path"),
139135
clang_path: matches.opt_str("clang-path").map(|s| Path::new(s)),
140136
llvm_bin_path: matches.opt_str("llvm-bin-path").map(|s| Path::new(s)),
141137
src_base: opt_path(matches, "src-base"),
142138
build_base: opt_path(matches, "build-base"),
143139
aux_base: opt_path(matches, "aux-base"),
144-
stage_id: matches.opt_str("stage-id").unwrap().to_string(),
140+
stage_id: matches.opt_str("stage-id").unwrap(),
145141
mode: FromStr::from_str(matches.opt_str("mode")
146142
.unwrap()
147143
.as_slice()).expect("invalid mode"),
@@ -155,32 +151,23 @@ pub fn parse_config(args: Vec<String> ) -> Config {
155151
ratchet_noise_percent:
156152
matches.opt_str("ratchet-noise-percent")
157153
.and_then(|s| from_str::<f64>(s.as_slice())),
158-
runtool: matches.opt_str("runtool").map(|x| x.to_string()),
159-
host_rustcflags: matches.opt_str("host-rustcflags")
160-
.map(|x| x.to_string()),
161-
target_rustcflags: matches.opt_str("target-rustcflags")
162-
.map(|x| x.to_string()),
154+
runtool: matches.opt_str("runtool"),
155+
host_rustcflags: matches.opt_str("host-rustcflags"),
156+
target_rustcflags: matches.opt_str("target-rustcflags"),
163157
jit: matches.opt_present("jit"),
164-
target: opt_str2(matches.opt_str("target").map(|x| x.to_string())),
165-
host: opt_str2(matches.opt_str("host").map(|x| x.to_string())),
158+
target: opt_str2(matches.opt_str("target")),
159+
host: opt_str2(matches.opt_str("host")),
166160
android_cross_path: opt_path(matches, "android-cross-path"),
167-
adb_path: opt_str2(matches.opt_str("adb-path")
168-
.map(|x| x.to_string())),
169-
adb_test_dir: opt_str2(matches.opt_str("adb-test-dir")
170-
.map(|x| x.to_string())),
161+
adb_path: opt_str2(matches.opt_str("adb-path")),
162+
adb_test_dir: opt_str2(matches.opt_str("adb-test-dir")),
171163
adb_device_status:
172164
"arm-linux-androideabi" ==
173-
opt_str2(matches.opt_str("target")
174-
.map(|x| x.to_string())).as_slice() &&
165+
opt_str2(matches.opt_str("target")).as_slice() &&
175166
"(none)" !=
176-
opt_str2(matches.opt_str("adb-test-dir")
177-
.map(|x| x.to_string())).as_slice() &&
178-
!opt_str2(matches.opt_str("adb-test-dir")
179-
.map(|x| x.to_string())).is_empty(),
180-
lldb_python_dir: matches.opt_str("lldb-python-dir")
181-
.map(|x| x.to_string()),
182-
test_shard: test::opt_shard(matches.opt_str("test-shard")
183-
.map(|x| x.to_string())),
167+
opt_str2(matches.opt_str("adb-test-dir")).as_slice() &&
168+
!opt_str2(matches.opt_str("adb-test-dir")).is_empty(),
169+
lldb_python_dir: matches.opt_str("lldb-python-dir"),
170+
test_shard: test::opt_shard(matches.opt_str("test-shard")),
184171
verbose: matches.opt_present("verbose")
185172
}
186173
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,23 +170,23 @@ fn iter_header(testfile: &Path, it: |&str| -> bool) -> bool {
170170
}
171171

172172
fn parse_error_pattern(line: &str) -> Option<String> {
173-
parse_name_value_directive(line, "error-pattern".to_string())
173+
parse_name_value_directive(line, "error-pattern")
174174
}
175175

176176
fn parse_aux_build(line: &str) -> Option<String> {
177-
parse_name_value_directive(line, "aux-build".to_string())
177+
parse_name_value_directive(line, "aux-build")
178178
}
179179

180180
fn parse_compile_flags(line: &str) -> Option<String> {
181-
parse_name_value_directive(line, "compile-flags".to_string())
181+
parse_name_value_directive(line, "compile-flags")
182182
}
183183

184184
fn parse_run_flags(line: &str) -> Option<String> {
185-
parse_name_value_directive(line, "run-flags".to_string())
185+
parse_name_value_directive(line, "run-flags")
186186
}
187187

188188
fn parse_check_line(line: &str) -> Option<String> {
189-
parse_name_value_directive(line, "check".to_string())
189+
parse_name_value_directive(line, "check")
190190
}
191191

192192
fn parse_force_host(line: &str) -> bool {
@@ -206,7 +206,7 @@ fn parse_no_pretty_expanded(line: &str) -> bool {
206206
}
207207

208208
fn parse_exec_env(line: &str) -> Option<(String, String)> {
209-
parse_name_value_directive(line, "exec-env".to_string()).map(|nv| {
209+
parse_name_value_directive(line, "exec-env").map(|nv| {
210210
// nv is either FOO or FOO=BAR
211211
let mut strs: Vec<String> = nv.as_slice()
212212
.splitn('=', 1)
@@ -225,7 +225,7 @@ fn parse_exec_env(line: &str) -> Option<(String, String)> {
225225
}
226226

227227
fn parse_pp_exact(line: &str, testfile: &Path) -> Option<Path> {
228-
match parse_name_value_directive(line, "pp-exact".to_string()) {
228+
match parse_name_value_directive(line, "pp-exact") {
229229
Some(s) => Some(Path::new(s)),
230230
None => {
231231
if parse_name_directive(line, "pp-exact") {
@@ -241,7 +241,7 @@ fn parse_name_directive(line: &str, directive: &str) -> bool {
241241
line.contains(directive)
242242
}
243243

244-
pub fn parse_name_value_directive(line: &str, directive: String)
244+
pub fn parse_name_value_directive(line: &str, directive: &str)
245245
-> Option<String> {
246246
let keycolon = format!("{}:", directive);
247247
match line.find_str(keycolon.as_slice()) {

0 commit comments

Comments
 (0)