---

yaml
---
r: 66523
b: refs/heads/master
c: af30fe2
h: refs/heads/master
i:
  66521: e83bb23
  66519: d67170a
v: v3

Author: ngsankha

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e482856d76fba8d31ee114d4fb74f8c18f63e73c
+refs/heads/master: af30fe25a58c5eb1ac088f824b22621ed3652976
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/librustc/back/link.rs

@@ -660,10 +660,9 @@ pub fn sanitize(s: &str) -> ~str {
             | '_' => result.push_char(c),
 
             _ => {
-                let mut tstr = ~"";
-                do char::escape_unicode(c) |c| { tstr.push_char(c); }
-                result.push_char('$');
-                result.push_str(tstr.slice_from(1));
+                if c > 'z' && char::is_XID_continue(c) {
+                    result.push_char(c);
+                }
             }
         }
     }

trunk/src/librustc/middle/kind.rs

@@ -198,8 +198,9 @@ fn with_appropriate_checker(cx: Context, id: node_id,
     fn check_for_bare(cx: Context, fv: @freevar_entry) {
         cx.tcx.sess.span_err(
             fv.span,
-            "attempted dynamic environment capture");
-    }
+            "can't capture dynamic environment in a fn item; \
+            use the || { ... } closure form instead");
+    } // same check is done in resolve.rs, but shouldn't be done
 
     let fty = ty::node_id_to_type(cx.tcx, id);
     match ty::get(fty).sty {

trunk/src/librustc/middle/resolve.rs

@@ -3382,7 +3382,8 @@ impl Resolver {
 
                         self.session.span_err(
                             span,
-                            "attempted dynamic environment-capture");
+                            "can't capture dynamic environment in a fn item; \
+                            use the || { ... } closure form instead");
                     } else {
                         // This was an attempt to use a type parameter outside
                         // its scope.
@@ -3404,7 +3405,8 @@ impl Resolver {
 
                         self.session.span_err(
                             span,
-                            "attempted dynamic environment-capture");
+                            "can't capture dynamic environment in a fn item; \
+                            use the || { ... } closure form instead");
                     } else {
                         // This was an attempt to use a type parameter outside
                         // its scope.
@@ -3846,27 +3848,6 @@ impl Resolver {
                           generics: &Generics,
                           fields: &[@struct_field],
                           visitor: ResolveVisitor) {
-        let mut ident_map = HashMap::new::<ast::ident, @struct_field>();
-        for fields.iter().advance |&field| {
-            match field.node.kind {
-                named_field(ident, _) => {
-                    match ident_map.find(&ident) {
-                        Some(&prev_field) => {
-                            let ident_str = self.session.str_of(ident);
-                            self.session.span_err(field.span,
-                                fmt!("field `%s` is already declared", ident_str));
-                            self.session.span_note(prev_field.span,
-                                "Previously declared here");
-                        },
-                        None => {
-                            ident_map.insert(ident, field);
-                        }
-                    }
-                }
-                _ => ()
-            }
-        }
-
         // If applicable, create a rib for the type parameters.
         do self.with_type_parameter_rib(HasTypeParameters
                                         (generics, id, 0,

trunk/src/librustc/middle/trans/base.rs

@@ -2901,10 +2901,6 @@ pub fn trans_crate(sess: session::Session,
                    reachable_map: @mut HashSet<ast::node_id>,
                    maps: astencode::Maps)
                    -> (ContextRef, ModuleRef, LinkMeta) {
-    // Before we touch LLVM, make sure that multithreading is enabled.
-    if unsafe { !llvm::LLVMRustStartMultithreading() } {
-        sess.bug("couldn't enable multi-threaded LLVM");
-    }
 
     let mut symbol_hasher = hash::default_state();
     let link_meta = link::build_link_meta(sess, crate, output, &mut symbol_hasher);
@@ -2919,6 +2915,12 @@ pub fn trans_crate(sess: session::Session,
     // 1. http://llvm.org/bugs/show_bug.cgi?id=11479
     let llmod_id = link_meta.name.to_owned() + ".rc";
 
+    // FIXME(#6511): get LLVM building with --enable-threads so this
+    //               function can be called
+    // if !llvm::LLVMRustStartMultithreading() {
+    //     sess.bug("couldn't enable multi-threaded LLVM");
+    // }
+
     let ccx = @mut CrateContext::new(sess,
                                      llmod_id,
                                      tcx,

trunk/src/librusti/rusti.rs

@@ -528,9 +528,6 @@ mod tests {
         }
     }
 
-    // FIXME: #7220 rusti on 32bit mac doesn't work.
-    #[cfg(not(target_word_size="32"))]
-    #[cfg(not(target_os="macos"))]
     fn run_program(prog: &str) {
         let mut r = repl();
         for prog.split_iter('\n').advance |cmd| {
@@ -539,66 +536,63 @@ mod tests {
             r = result.expect(fmt!("the command '%s' failed", cmd));
         }
     }
-    #[cfg(target_word_size="32", target_os="macos")]
-    fn run_program(_: &str) {}
 
     #[test]
-    fn super_basic() {
+    // FIXME: #7220 rusti on 32bit mac doesn't work.
+    #[cfg(not(target_word_size="32",
+              target_os="macos"))]
+    fn run_all() {
+        // FIXME(#7071):
+        // By default, unit tests are run in parallel. Rusti, on the other hand,
+        // does not enjoy doing this. I suspect that it is because the LLVM
+        // bindings are not thread-safe (when running parallel tests, some tests
+        // were triggering assertions in LLVM (or segfaults). Hence, this
+        // function exists to run everything serially (sadface).
+        //
+        // To get some interesting output, run with RUST_LOG=rusti::tests
+
+        debug!("hopefully this runs");
         run_program("");
-    }
 
-    #[test]
-    fn regression_5937() {
+        debug!("regression test for #5937");
         run_program("use std::hashmap;");
-    }
 
-    #[test]
-    fn regression_5784() {
+        debug!("regression test for #5784");
         run_program("let a = 3;");
-    }
 
-    #[test] #[ignore]
-    fn new_tasks() {
         // XXX: can't spawn new tasks because the JIT code is cleaned up
         //      after the main function is done.
-        run_program("
-            spawn( || println(\"Please don't segfault\") );
-            do spawn { println(\"Please?\"); }
-        ");
-    }
+        // debug!("regression test for #5803");
+        // run_program("
+        //     spawn( || println(\"Please don't segfault\") );
+        //     do spawn { println(\"Please?\"); }
+        // ");
 
-    #[test]
-    fn inferred_integers_usable() {
+        debug!("inferred integers are usable");
         run_program("let a = 2;\n()\n");
         run_program("
             let a = 3;
             let b = 4u;
             assert!((a as uint) + b == 7)
         ");
-    }
 
-    #[test]
-    fn local_variables_allow_shadowing() {
+        debug!("local variables can be shadowed");
         run_program("
             let a = 3;
             let a = 5;
             assert!(a == 5)
         ");
-    }
 
-    #[test]
-    fn string_usable() {
+        debug!("strings are usable");
         run_program("
             let a = ~\"\";
             let b = \"\";
             let c = @\"\";
             let d = a + b + c;
             assert!(d.len() == 0);
         ");
-    }
 
-    #[test]
-    fn vectors_usable() {
+        debug!("vectors are usable");
         run_program("
             let a = ~[1, 2, 3];
             let b = &[1, 2, 3];
@@ -607,19 +601,15 @@ mod tests {
             assert!(d.len() == 9);
             let e: &[int] = [];
         ");
-    }
 
-    #[test]
-    fn structs_usable() {
+        debug!("structs are usable");
         run_program("
             struct A{ a: int }
             let b = A{ a: 3 };
             assert!(b.a == 3)
         ");
-    }
 
-    #[test]
-    fn mutable_variables_work() {
+        debug!("mutable variables");
         run_program("
             let mut a = 3;
             a = 5;
@@ -628,37 +618,29 @@ mod tests {
             assert!(b.contains(&5))
             assert!(b.len() == 1)
         ");
-    }
 
-    #[test]
-    fn functions_saved() {
+        debug!("functions are cached");
         run_program("
             fn fib(x: int) -> int { if x < 2 {x} else { fib(x - 1) + fib(x - 2) } }
             let a = fib(3);
             let a = a + fib(4);
             assert!(a == 5)
         ");
-    }
 
-    #[test]
-    fn modules_saved() {
+        debug!("modules are cached");
         run_program("
             mod b { pub fn foo() -> uint { 3 } }
             assert!(b::foo() == 3)
         ");
-    }
 
-    #[test]
-    fn multiple_functions() {
+        debug!("multiple function definitions are allowed");
         run_program("
             fn f() {}
             fn f() {}
             f()
         ");
-    }
 
-    #[test]
-    fn multiple_items_same_name() {
+        debug!("multiple item definitions are allowed");
         run_program("
             fn f() {}
             mod f {}
@@ -675,6 +657,9 @@ mod tests {
     }
 
     #[test]
+    // FIXME: #7220 rusti on 32bit mac doesn't work.
+    #[cfg(not(target_word_size="32",
+              target_os="macos"))]
     fn exit_quits() {
         let mut r = repl();
         assert!(r.running);

trunk/src/librustpkg/tests.rs

@@ -307,10 +307,18 @@ fn frob_source_file(workspace: &Path, pkgid: &PkgId) {
     }
 }
 
-// FIXME(#7249): these tests fail on multi-platform builds, so for now they're
-//               only run one x86
+#[test] #[ignore] //FIXME(#7249)
+fn test_all() {
+    // FIXME(#7071): these tests use rustc, so they can't be run in parallel
+    //               until this issue is resolved
+    test_make_dir_rwx();
+    test_install_valid();
+    test_install_invalid();
+    test_install_url();
+    test_package_ids_must_be_relative_path_like();
+    test_package_version();
+}
 
-#[test] #[ignore(cfg(target_arch = "x86"))]
 fn test_make_dir_rwx() {
     let temp = &os::tmpdir();
     let dir = temp.push("quux");
@@ -323,7 +331,6 @@ fn test_make_dir_rwx() {
     assert!(os::remove_dir_recursive(&dir));
 }
 
-#[test] #[ignore(cfg(target_arch = "x86"))]
 fn test_install_valid() {
     use path_util::installed_library_in_workspace;
 
@@ -353,7 +360,6 @@ fn test_install_valid() {
     assert!(!os::path_exists(&bench));
 }
 
-#[test] #[ignore(cfg(target_arch = "x86"))]
 fn test_install_invalid() {
     use conditions::nonexistent_package::cond;
     use cond1 = conditions::missing_pkg_files::cond;
@@ -376,7 +382,6 @@ fn test_install_invalid() {
     assert!(error_occurred && error1_occurred);
 }
 
-#[test] #[ignore(cfg(target_arch = "x86"))]
 fn test_install_url() {
     let workspace = mkdtemp(&os::tmpdir(), "test").expect("couldn't create temp dir");
     let sysroot = test_sysroot();
@@ -412,7 +417,6 @@ fn test_install_url() {
     assert!(!os::path_exists(&bench));
 }
 
-#[test] #[ignore(cfg(target_arch = "x86"))]
 fn test_package_ids_must_be_relative_path_like() {
     use conditions::bad_pkg_id::cond;
 
@@ -453,7 +457,6 @@ fn test_package_ids_must_be_relative_path_like() {
 
 }
 
-#[test] #[ignore(cfg(target_arch = "x86"))]
 fn test_package_version() {
     let temp_pkg_id = PkgId::new("github.com/catamorphism/test_pkg_version");
     match temp_pkg_id.version {
@@ -476,8 +479,9 @@ fn test_package_version() {
                     push("test_pkg_version")));
 }
 
-// FIXME #7006: Fails on linux/mac for some reason
-#[test] #[ignore]
+// FIXME #7006: Fails on linux for some reason
+#[test]
+#[ignore]
 fn test_package_request_version() {
     let temp_pkg_id = PkgId::new("github.com/catamorphism/test_pkg_version#0.3");
     let temp = mk_empty_workspace(&LocalPath(Path("test_pkg_version")), &ExactRevision(~"0.3"));

trunk/src/rustllvm/llvm-auto-clean-trigger

@@ -1,4 +0,0 @@
-# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
-# The actual contents of this file do not matter, but to trigger a change on the
-# build bots then the contents should be changed so git updates the mtime.
-6-29-2013

trunk/src/test/compile-fail/bad-env-capture.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: attempted dynamic environment-capture
+// error-pattern: can't capture dynamic environment in a fn item;
 fn foo() {
     let x: int;
     fn bar() { log(debug, x); }

trunk/src/test/compile-fail/bad-env-capture2.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: attempted dynamic environment-capture
+// error-pattern: can't capture dynamic environment in a fn item;
 fn foo(x: int) {
     fn bar() { log(debug, x); }
 }

trunk/src/test/compile-fail/bad-env-capture3.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: attempted dynamic environment-capture
+// error-pattern: can't capture dynamic environment in a fn item;
 fn foo(x: int) {
     fn mth() {
         fn bar() { log(debug, x); }

trunk/src/test/compile-fail/capture1.rs

@@ -10,7 +10,7 @@
 // except according to those terms.
 
 
-// error-pattern: attempted dynamic environment-capture
+// error-pattern: can't capture dynamic environment in a fn item;
 
 fn main() {
     let bar: int = 5;