---

yaml
---
r: 151655
b: refs/heads/try2
c: fdb30cd
h: refs/heads/master
i:
  151653: aa25093
  151651: bf0451d
  151647: e413a3e
v: v3

Author: pongad

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: d78718ad6317b21c58cfd6723501a9487378b0c7
+refs/heads/try2: fdb30cd22cfc3db34874be13913a9c0720c64b3b
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/man/rustc.1

@@ -138,6 +138,9 @@ A space-separated list of arguments to pass through to LLVM.
 If specified, the compiler will save more files (.bc, .o, .no-opt.bc) generated
 throughout compilation in the output directory.
 .TP
+\fBandroid-cross-path\fR=path/to/ndk/bin
+Directory to find the Android NDK cross-compilation tools
+.TP
 \fBno-rpath\fR
 If specified, then the rpath value for dynamic libraries will not be set in
 either dynamic library or executable outputs.

branches/try2/mk/platform.mk

@@ -307,7 +307,7 @@ CFG_LDPATH_arm-linux-androideabi :=
 CFG_RUN_arm-linux-androideabi=
 CFG_RUN_TARG_arm-linux-androideabi=
 RUSTC_FLAGS_arm-linux-androideabi :=
-RUSTC_CROSS_FLAGS_arm-linux-androideabi :=
+RUSTC_CROSS_FLAGS_arm-linux-androideabi :=-C android-cross-path=$(CFG_ANDROID_CROSS_PATH)
 
 # arm-unknown-linux-gnueabihf configuration
 CROSS_PREFIX_arm-unknown-linux-gnueabihf=arm-linux-gnueabihf-

branches/try2/mk/tests.mk

@@ -601,7 +601,6 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) :=						\
         --stage-id stage$(1)-$(2)							\
         --target $(2)                                       \
         --host $(3)                                       \
-        --android-cross-path=$(CFG_ANDROID_CROSS_PATH)    \
         --adb-path=$(CFG_ADB)                          \
         --adb-test-dir=$(CFG_ADB_TEST_DIR)                  \
         --host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \

branches/try2/src/compiletest/common.rs

@@ -126,9 +126,6 @@ pub struct Config {
     // Host triple for the compiler being invoked
     pub host: ~str,
 
-    // Path to the android tools
-    pub android_cross_path: Path,
-
     // Extra parameter to run adb on arm-linux-androideabi
     pub adb_path: ~str,
 

branches/try2/src/compiletest/compiletest.rs

@@ -79,7 +79,6 @@ pub fn parse_config(args: Vec<~str> ) -> Config {
           optflag("", "jit", "run tests under the JIT"),
           optopt("", "target", "the target to build for", "TARGET"),
           optopt("", "host", "the host to build for", "HOST"),
-          optopt("", "android-cross-path", "Android NDK standalone path", "PATH"),
           optopt("", "adb-path", "path to the android debugger", "PATH"),
           optopt("", "adb-test-dir", "path to tests for the android debugger", "PATH"),
           optopt("", "lldb-python-dir", "directory containing LLDB's python module", "PATH"),
@@ -143,7 +142,6 @@ pub fn parse_config(args: Vec<~str> ) -> Config {
         jit: matches.opt_present("jit"),
         target: opt_str2(matches.opt_str("target")).to_str(),
         host: opt_str2(matches.opt_str("host")).to_str(),
-        android_cross_path: opt_path(matches, "android-cross-path"),
         adb_path: opt_str2(matches.opt_str("adb-path")).to_str(),
         adb_test_dir:
             opt_str2(matches.opt_str("adb-test-dir")).to_str(),
@@ -175,7 +173,6 @@ pub fn log_config(config: &Config) {
     logv(c, format!("jit: {}", config.jit));
     logv(c, format!("target: {}", config.target));
     logv(c, format!("host: {}", config.host));
-    logv(c, format!("android-cross-path: {}", config.android_cross_path.display()));
     logv(c, format!("adb_path: {}", config.adb_path));
     logv(c, format!("adb_test_dir: {}", config.adb_test_dir));
     logv(c, format!("adb_device_status: {}", config.adb_device_status));

branches/try2/src/compiletest/runtest.rs

@@ -347,10 +347,18 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
                 break;
             }
 
-            let tool_path = match config.android_cross_path.as_str() {
-                Some(x) => x.to_strbuf(),
-                None => fatal("cannot find android cross path".to_owned())
-            };
+            let args = split_maybe_args(&config.target_rustcflags);
+            let mut tool_path = StrBuf::new();
+            for arg in args.iter() {
+                if arg.contains("android-cross-path=") {
+                    tool_path = StrBuf::from_str(arg.replace("android-cross-path=", ""));
+                    break;
+                }
+            }
+
+            if tool_path.is_empty() {
+                fatal("cannot found android cross path".to_owned());
+            }
 
             let debugger_script = make_out_name(config, testfile, "debugger.script");
             // FIXME (#9639): This needs to handle non-utf8 paths

branches/try2/src/etc/zsh/_rust

@@ -5,6 +5,7 @@ local -a _rustc_opts_switches _rustc_opts_lint _rustc_opts_debug
 typeset -A opt_args
 
 _rustc_opts_switches=(
+    --android-cross-path'[The path to the Android NDK]'
     --ar'[Program to use for managing archives instead of the default.]'
     -c'[Compile and assemble, but do not link]'
     --cfg'[Configure the compilation environment]'

branches/try2/src/libcollections/hashmap.rs

@@ -1906,7 +1906,7 @@ mod test_map {
         }
         assert_eq!(m.len(), 32);
 
-        let mut observed: u32 = 0;
+        let mut observed = 0;
 
         for (k, v) in m.iter() {
             assert_eq!(*v, *k * 2);
@@ -2102,7 +2102,7 @@ mod test_set {
         for i in range(0u, 32) {
             assert!(a.insert(i));
         }
-        let mut observed: u32 = 0;
+        let mut observed = 0;
         for k in a.iter() {
             observed |= 1 << *k;
         }