Merge remote-tracking branch 'remotes/origin/master' into str-remove-null

Author: erickt

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "src/llvm"]
 	path = src/llvm
-	url = https://github.com/brson/llvm.git
+	url = https://github.com/alexcrichton/llvm.git
 	branch = master
 [submodule "src/libuv"]
 	path = src/libuv

doc/po/rust.md.pot

@@ -1792,11 +1792,11 @@ msgstr ""
 msgid ""
 "~~~~ {.xfail-test}\n"
 "fn iter<T>(seq: &[T], f: &fn(T)) {\n"
-"    foreach elt in seq.iter() { f(elt); }\n"
+"    for elt in seq.iter() { f(elt); }\n"
 "}\n"
 "fn map<T, U>(seq: &[T], f: &fn(T) -> U) -> ~[U] {\n"
 "    let mut acc = ~[];\n"
-"    foreach elt in seq.iter() { acc.push(f(elt)); }\n"
+"    for elt in seq.iter() { acc.push(f(elt)); }\n"
 "    acc\n"
 "}\n"
 "~~~~\n"
@@ -4570,7 +4570,7 @@ msgstr ""
 #: doc/rust.md:2405
 #, no-wrap
 msgid ""
-"foreach e in v.iter() {\n"
+"for e in v.iter() {\n"
 "    bar(*e);\n"
 "}\n"
 "~~~~\n"

doc/po/tutorial-container.md.pot

@@ -376,7 +376,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "// print out all the elements in the vector\n"
-"foreach x in xs.iter() {\n"
+"for x in xs.iter() {\n"
 "    println(x.to_str())\n"
 "}\n"
 msgstr ""
@@ -386,7 +386,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "// print out all but the first 3 elements in the vector\n"
-"foreach x in xs.iter().skip(3) {\n"
+"for x in xs.iter().skip(3) {\n"
 "    println(x.to_str())\n"
 "}\n"
 "~~~\n"
@@ -418,7 +418,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "// print out the pairs of elements up to (&3, &\"baz\")\n"
-"foreach (x, y) in it {\n"
+"for (x, y) in it {\n"
 "    println(fmt!(\"%d %s\", *x, *y));\n"
 msgstr ""
 
@@ -487,7 +487,7 @@ msgid ""
 "    pub fn from_iterator(iterator: &mut T) -> ~[A] {\n"
 "        let (lower, _) = iterator.size_hint();\n"
 "        let mut xs = with_capacity(lower);\n"
-"        foreach x in iterator {\n"
+"        for x in iterator {\n"
 "            xs.push(x);\n"
 "        }\n"
 "        xs\n"
@@ -587,7 +587,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "// prints `5`, `4` and `3`\n"
-"foreach &x in it.invert() {\n"
+"for &x in it.invert() {\n"
 "    println(fmt!(\"%?\", x))\n"
 "}\n"
 "~~~\n"

doc/po/tutorial-tasks.md.pot

@@ -587,7 +587,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "    let mut final_res = 0f64;\n"
-"    foreach ft in futures.mut_iter()  {\n"
+"    for ft in futures.mut_iter()  {\n"
 "        final_res += ft.get();\n"
 "    }\n"
 "    println(fmt!(\"^2/6 is not far from : %?\", final_res));\n"

doc/po/tutorial.md.pot

@@ -2501,7 +2501,7 @@ msgstr ""
 msgid ""
 "// Iterate over a vector, obtaining a pointer to each element\n"
 "// (`for` is explained in the next section)\n"
-"foreach crayon in crayons.iter() {\n"
+"for crayon in crayons.iter() {\n"
 "    let delicious_crayon_wax = unwrap_crayon(*crayon);\n"
 "    eat_crayon_wax(delicious_crayon_wax);\n"
 "}\n"
@@ -3101,7 +3101,7 @@ msgid ""
 "~~~~\n"
 "fn map<T, U>(vector: &[T], function: &fn(v: &T) -> U) -> ~[U] {\n"
 "    let mut accumulator = ~[];\n"
-"    foreach element in vector.iter() {\n"
+"    for element in vector.iter() {\n"
 "        accumulator.push(function(element));\n"
 "    }\n"
 "    return accumulator;\n"
@@ -3570,7 +3570,7 @@ msgid ""
 "~~~~\n"
 "# trait Printable { fn print(&self); }\n"
 "fn print_all<T: Printable>(printable_things: ~[T]) {\n"
-"    foreach thing in printable_things.iter() {\n"
+"    for thing in printable_things.iter() {\n"
 "        thing.print();\n"
 "    }\n"
 "}\n"
@@ -3650,7 +3650,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "fn draw_all<T: Drawable>(shapes: ~[T]) {\n"
-"    foreach shape in shapes.iter() { shape.draw(); }\n"
+"    for shape in shapes.iter() { shape.draw(); }\n"
 "}\n"
 "# let c: Circle = new_circle();\n"
 "# draw_all(~[c]);\n"
@@ -3673,7 +3673,7 @@ msgid ""
 "~~~~\n"
 "# trait Drawable { fn draw(&self); }\n"
 "fn draw_all(shapes: &[@Drawable]) {\n"
-"    foreach shape in shapes.iter() { shape.draw(); }\n"
+"    for shape in shapes.iter() { shape.draw(); }\n"
 "}\n"
 "~~~~\n"
 msgstr ""

doc/rust.md

@@ -880,11 +880,11 @@ the function name.
 
 ~~~~ {.xfail-test}
 fn iter<T>(seq: &[T], f: &fn(T)) {
-    foreach elt in seq.iter() { f(elt); }
+    for elt in seq.iter() { f(elt); }
 }
 fn map<T, U>(seq: &[T], f: &fn(T) -> U) -> ~[U] {
     let mut acc = ~[];
-    foreach elt in seq.iter() { acc.push(f(elt)); }
+    for elt in seq.iter() { acc.push(f(elt)); }
     acc
 }
 ~~~~
@@ -2378,7 +2378,7 @@ An example of a for loop over the contents of a vector:
 
 let v: &[foo] = &[a, b, c];
 
-foreach e in v.iter() {
+for e in v.iter() {
     bar(*e);
 }
 ~~~~
@@ -2387,7 +2387,7 @@ An example of a for loop over a series of integers:
 
 ~~~~
 # fn bar(b:uint) { }
-foreach i in range(0u, 256) {
+for i in range(0u, 256) {
     bar(i);
 }
 ~~~~

doc/tutorial-tasks.md

@@ -121,7 +121,7 @@ should interleave the output in vaguely random order.
 # use std::io::print;
 # use std::task::spawn;
 
-foreach child_task_number in range(0, 20) {
+for child_task_number in range(0, 20) {
     do spawn {
        print(fmt!("I am child number %d\n", child_task_number));
     }
@@ -240,7 +240,7 @@ Instead we can use a `SharedChan`, a type that allows a single
 let (port, chan) = stream();
 let chan = SharedChan::new(chan);
 
-foreach init_val in range(0u, 3) {
+for init_val in range(0u, 3) {
     // Create a new channel handle to distribute to the child task
     let child_chan = chan.clone();
     do spawn {
@@ -314,7 +314,7 @@ be distributed on the available cores.
 # use std::vec;
 fn partial_sum(start: uint) -> f64 {
     let mut local_sum = 0f64;
-    foreach num in range(start*100000, (start+1)*100000) {
+    for num in range(start*100000, (start+1)*100000) {
         local_sum += (num as f64 + 1.0).pow(&-2.0);
     }
     local_sum
@@ -324,7 +324,7 @@ fn main() {
     let mut futures = vec::from_fn(1000, |ind| do extra::future::spawn { partial_sum(ind) });
 
     let mut final_res = 0f64;
-    foreach ft in futures.mut_iter()  {
+    for ft in futures.mut_iter()  {
         final_res += ft.get();
     }
     println(fmt!("π^2/6 is not far from : %?", final_res));
@@ -359,7 +359,7 @@ fn main() {
 
     let numbers_arc = Arc::new(numbers);
 
-    foreach num in range(1u, 10) {
+    for num in range(1u, 10) {
         let (port, chan)  = stream();
         chan.send(numbers_arc.clone());
 

mk/llvm.mk

@@ -14,7 +14,9 @@ LLVM_DEPS := $(S)/.gitmodules
 else
 
 # This is just a rough approximation of LLVM deps
-LLVM_DEPS=$(call rwildcard,$(CFG_LLVM_SRC_DIR),*cpp *hpp)
+LLVM_DEPS_SRC=$(call rwildcard,$(CFG_LLVM_SRC_DIR)/lib,*cpp *hpp)
+LLVM_DEPS_INC=$(call rwildcard,$(CFG_LLVM_SRC_DIR)/include,*cpp *hpp)
+LLVM_DEPS=$(LLVM_DEPS_SRC) $(LLVM_DEPS_INC)
 endif
 
 define DEF_LLVM_RULES

src/compiletest/compiletest.rs

@@ -243,7 +243,7 @@ pub fn make_tests(config: &config) -> ~[test::TestDescAndFn] {
            config.src_base.to_str());
     let mut tests = ~[];
     let dirs = os::list_dir_path(&config.src_base);
-    foreach file in dirs.iter() {
+    for file in dirs.iter() {
         let file = file.clone();
         debug!("inspecting file %s", file.to_str());
         if is_test(config, &file) {
@@ -271,11 +271,11 @@ pub fn is_test(config: &config, testfile: &Path) -> bool {
 
     let mut valid = false;
 
-    foreach ext in valid_extensions.iter() {
+    for ext in valid_extensions.iter() {
         if name.ends_with(*ext) { valid = true; }
     }
 
-    foreach pre in invalid_prefixes.iter() {
+    for pre in invalid_prefixes.iter() {
         if name.starts_with(*pre) { valid = false; }
     }
 

src/compiletest/procsrv.rs

@@ -56,7 +56,7 @@ pub fn run(lib_path: &str,
         err_fd: None
     });
 
-    foreach input in input.iter() {
+    for input in input.iter() {
         proc.input().write_str(*input);
     }
     let output = proc.finish_with_output();

src/compiletest/runtest.rs

@@ -282,7 +282,7 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
         // check if each line in props.check_lines appears in the
         // output (in order)
         let mut i = 0u;
-        foreach line in ProcRes.stdout.line_iter() {
+        for line in ProcRes.stdout.line_iter() {
             if check_lines[i].trim() == line.trim() {
                 i += 1u;
             }
@@ -312,7 +312,7 @@ fn check_error_patterns(props: &TestProps,
     let mut next_err_idx = 0u;
     let mut next_err_pat = &props.error_patterns[next_err_idx];
     let mut done = false;
-    foreach line in ProcRes.stderr.line_iter() {
+    for line in ProcRes.stderr.line_iter() {
         if line.contains(*next_err_pat) {
             debug!("found error pattern %s", *next_err_pat);
             next_err_idx += 1u;
@@ -332,7 +332,7 @@ fn check_error_patterns(props: &TestProps,
         fatal_ProcRes(fmt!("error pattern '%s' not found!",
                            missing_patterns[0]), ProcRes);
     } else {
-        foreach pattern in missing_patterns.iter() {
+        for pattern in missing_patterns.iter() {
             error(fmt!("error pattern '%s' not found!", *pattern));
         }
         fatal_ProcRes(~"multiple error patterns not found", ProcRes);
@@ -385,9 +385,9 @@ fn check_expected_errors(expected_errors: ~[errors::ExpectedError],
     //    filename:line1:col1: line2:col2: *warning:* msg
     // where line1:col1: is the starting point, line2:col2:
     // is the ending point, and * represents ANSI color codes.
-    foreach line in ProcRes.stderr.line_iter() {
+    for line in ProcRes.stderr.line_iter() {
         let mut was_expected = false;
-        foreach (i, ee) in expected_errors.iter().enumerate() {
+        for (i, ee) in expected_errors.iter().enumerate() {
             if !found_flags[i] {
                 debug!("prefix=%s ee.kind=%s ee.msg=%s line=%s",
                        prefixes[i], ee.kind, ee.msg, line);
@@ -413,7 +413,7 @@ fn check_expected_errors(expected_errors: ~[errors::ExpectedError],
         }
     }
 
-    foreach i in range(0u, found_flags.len()) {
+    for i in range(0u, found_flags.len()) {
         if !found_flags[i] {
             let ee = &expected_errors[i];
             fatal_ProcRes(fmt!("expected %s on line %u not found: %s",
@@ -558,7 +558,7 @@ fn compose_and_run_compiler(
     let extra_link_args = ~[~"-L",
                             aux_output_dir_name(config, testfile).to_str()];
 
-    foreach rel_ab in props.aux_builds.iter() {
+    for rel_ab in props.aux_builds.iter() {
         let abs_ab = config.aux_base.push_rel(&Path(*rel_ab));
         let aux_args =
             make_compile_args(config, props, ~[~"--lib"] + extra_link_args,
@@ -785,7 +785,7 @@ fn _arm_exec_compiled_test(config: &config, props: &TestProps,
     runargs.push(fmt!("%s", config.adb_test_dir));
     runargs.push(fmt!("%s", prog_short));
 
-    foreach tv in args.args.iter() {
+    for tv in args.args.iter() {
         runargs.push(tv.to_owned());
     }
 
@@ -802,7 +802,7 @@ fn _arm_exec_compiled_test(config: &config, props: &TestProps,
                      Some(~""));
 
     let mut exitcode : int = 0;
-    foreach c in exitcode_out.iter() {
+    for c in exitcode_out.iter() {
         if !c.is_digit() { break; }
         exitcode = exitcode * 10 + match c {
             '0' .. '9' => c as int - ('0' as int),
@@ -851,7 +851,7 @@ fn _arm_push_aux_shared_library(config: &config, testfile: &Path) {
     let tstr = aux_output_dir_name(config, testfile).to_str();
 
     let dirs = os::list_dir_path(&Path(tstr));
-    foreach file in dirs.iter() {
+    for file in dirs.iter() {
 
         if (file.filetype() == Some(~".so")) {
 

src/etc/check-links.pl

@@ -7,15 +7,15 @@
 my $anchors = {};
 
 my $i = 0;
-foreach $line (@lines) {
+for $line (@lines) {
     $i++;
     if ($line =~ m/id="([^"]+)"/) {
         $anchors->{$1} = $i;
     }
 }
 
 $i = 0;
-foreach $line (@lines) {
+for $line (@lines) {
     $i++;
     while ($line =~ m/href="#([^"]+)"/g) {
         if (! exists($anchors->{$1})) {

src/etc/emacs/rust-mode.el

@@ -102,7 +102,7 @@
     "do"
     "else" "enum" "extern"
     "false" "fn" "for"
-    "if" "impl"
+    "if" "impl" "in"
     "let" "loop"
     "match" "mod" "mut"
     "priv" "pub"