---

yaml
---
r: 144305
b: refs/heads/try2
c: 77a3de3
h: refs/heads/master
i:
  144303: 48df8ab
v: v3

Author: lilyball

[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: 9e1e15209129dad9d3bba90450a43ffb2505df14
+refs/heads/try2: 77a3de3b95e74b50a1b62ac80ca90b3cf832f8d7
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/rust.md

@@ -851,38 +851,6 @@ In this example, the module `quux` re-exports all of the public names defined in
 
 Also note that the paths contained in `use` items are relative to the crate root.
 So, in the previous example, the `use` refers to `quux::foo::*`, and not simply to `foo::*`.
-This also means that top-level module declarations should be at the crate root if direct usage
-of the declared modules within `use` items is desired.  It is also possible to use `self` and `super`
-at the beginning of a `use` item to refer to the current and direct parent modules respectively.
-All rules regarding accessing declared modules in `use` declarations applies to both module declarations
-and `extern mod` declarations.
-
-An example of what will and will not work for `use` items:
-~~~~
-# #[allow(unused_imports)];
-use foo::extra;          // good: foo is at the root of the crate
-use foo::baz::foobaz;    // good: foo is at the root of the crate
-
-mod foo {
-    extern mod extra;
-
-    use foo::extra::list;  // good: foo is at crate root
-//  use extra::*;          // bad:  extra is not at the crate root
-    use self::baz::foobaz; // good: self refers to module 'foo'
-    use foo::bar::foobar;  // good: foo is at crate root
-
-    pub mod bar {
-        pub fn foobar() { }
-    }
-
-    pub mod baz {
-        use super::bar::foobar; // good: super refers to module 'foo'
-        pub fn foobaz() { }
-    }
-}
-
-fn main() {}
-~~~~
 
 ### Functions
 

branches/try2/mk/tests.mk

@@ -240,8 +240,6 @@ tidy:
 		@$(call E, check: formatting)
 		$(Q)find $(S)src -name '*.r[sc]' \
 		| grep '^$(S)src/test' -v \
-		| grep '^$(S)src/libuv' -v \
-		| grep '^$(S)src/llvm' -v \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)find $(S)src/etc -name '*.py' \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py

branches/try2/src/libextra/arc.rs

@@ -612,7 +612,7 @@ mod tests {
         }
     }
 
-    #[test] #[should_fail]
+    #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_arc_condvar_poison() {
         unsafe {
             let arc = ~MutexArc::new(1);
@@ -636,7 +636,7 @@ mod tests {
             }
         }
     }
-    #[test] #[should_fail]
+    #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_mutex_arc_poison() {
         unsafe {
             let arc = ~MutexArc::new(1);
@@ -651,7 +651,7 @@ mod tests {
             }
         }
     }
-    #[test] #[should_fail]
+    #[test] #[should_fail] #[ignore(cfg(windows))]
     pub fn test_mutex_arc_unwrap_poison() {
         let arc = MutexArc::new(1);
         let arc2 = ~(&arc).clone();
@@ -668,7 +668,7 @@ mod tests {
         let one = arc.unwrap();
         assert!(one == 1);
     }
-    #[test] #[should_fail]
+    #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_rw_arc_poison_wr() {
         let arc = ~RWArc::new(1);
         let arc2 = (*arc).clone();
@@ -681,7 +681,7 @@ mod tests {
             assert_eq!(*one, 1);
         }
     }
-    #[test] #[should_fail]
+    #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_rw_arc_poison_ww() {
         let arc = ~RWArc::new(1);
         let arc2 = (*arc).clone();
@@ -694,7 +694,7 @@ mod tests {
             assert_eq!(*one, 1);
         }
     }
-    #[test] #[should_fail]
+    #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_rw_arc_poison_dw() {
         let arc = ~RWArc::new(1);
         let arc2 = (*arc).clone();
@@ -709,7 +709,7 @@ mod tests {
             assert_eq!(*one, 1);
         }
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_rw_arc_no_poison_rr() {
         let arc = ~RWArc::new(1);
         let arc2 = (*arc).clone();
@@ -722,7 +722,7 @@ mod tests {
             assert_eq!(*one, 1);
         }
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_rw_arc_no_poison_rw() {
         let arc = ~RWArc::new(1);
         let arc2 = (*arc).clone();
@@ -735,7 +735,7 @@ mod tests {
             assert_eq!(*one, 1);
         }
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_rw_arc_no_poison_dr() {
         let arc = ~RWArc::new(1);
         let arc2 = (*arc).clone();

branches/try2/src/libextra/arena.rs

@@ -291,6 +291,7 @@ fn test_arena_destructors() {
 
 #[test]
 #[should_fail]
+#[ignore(cfg(windows))]
 fn test_arena_destructors_fail() {
     let arena = Arena::new();
     // Put some stuff in the arena.

branches/try2/src/libextra/c_vec.rs

@@ -185,6 +185,7 @@ mod tests {
 
     #[test]
     #[should_fail]
+    #[ignore(cfg(windows))]
     fn test_overrun_get() {
         let cv = malloc(16u as size_t);
 
@@ -193,6 +194,7 @@ mod tests {
 
     #[test]
     #[should_fail]
+    #[ignore(cfg(windows))]
     fn test_overrun_set() {
         let cv = malloc(16u as size_t);
 

branches/try2/src/libextra/flatpipes.rs

@@ -967,10 +967,12 @@ mod test {
         }
 
         #[test]
+        #[ignore(cfg(windows))]
         fn test_try_recv_none4_reader() {
             test_try_recv_none4(reader_port_loader);
         }
         #[test]
+        #[ignore(cfg(windows))]
         fn test_try_recv_none4_pipe() {
             test_try_recv_none4(pipe_port_loader);
         }

branches/try2/src/libextra/future.rs

@@ -212,6 +212,7 @@ mod test {
 
     #[test]
     #[should_fail]
+    #[ignore(cfg(target_os = "win32"))]
     fn test_futurefail() {
         let mut f = spawn(|| fail!());
         let _x: ~str = f.get();

branches/try2/src/libextra/priority_queue.rs

@@ -338,6 +338,7 @@ mod tests {
 
     #[test]
     #[should_fail]
+    #[ignore(cfg(windows))]
     fn test_empty_pop() { let mut heap = PriorityQueue::new::<int>(); heap.pop(); }
 
     #[test]
@@ -348,6 +349,7 @@ mod tests {
 
     #[test]
     #[should_fail]
+    #[ignore(cfg(windows))]
     fn test_empty_top() { let empty = PriorityQueue::new::<int>(); empty.top(); }
 
     #[test]
@@ -358,6 +360,7 @@ mod tests {
 
     #[test]
     #[should_fail]
+    #[ignore(cfg(windows))]
     fn test_empty_replace() { let mut heap = PriorityQueue::new(); heap.replace(5); }
 
     #[test]

branches/try2/src/libextra/sync.rs

@@ -921,7 +921,7 @@ mod tests {
             assert!(!cond.signal());
         }
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_mutex_killed_simple() {
         // Mutex must get automatically unlocked if failed/killed within.
         let m = ~Mutex::new();
@@ -937,7 +937,7 @@ mod tests {
         do m.lock { }
     }
     #[ignore(reason = "linked failure")]
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_mutex_killed_cond() {
         // Getting killed during cond wait must not corrupt the mutex while
         // unwinding (e.g. double unlock).
@@ -964,7 +964,7 @@ mod tests {
         }
     }
     #[ignore(reason = "linked failure")]
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_mutex_killed_broadcast() {
         use std::unstable::finally::Finally;
 
@@ -1024,7 +1024,7 @@ mod tests {
             cond.wait();
         }
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_mutex_different_conds() {
         let result = do task::try {
             let m = ~Mutex::new_with_condvars(2);
@@ -1045,7 +1045,7 @@ mod tests {
         };
         assert!(result.is_err());
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_mutex_no_condvars() {
         let result = do task::try {
             let m = ~Mutex::new_with_condvars(0);
@@ -1275,7 +1275,7 @@ mod tests {
         test_rwlock_cond_broadcast_helper(12, false, true);
         test_rwlock_cond_broadcast_helper(12, false, false);
     }
-    #[cfg(test)]
+    #[cfg(test)] #[ignore(cfg(windows))]
     fn rwlock_kill_helper(mode1: RWLockMode, mode2: RWLockMode) {
         // Mutex must get automatically unlocked if failed/killed within.
         let x = ~RWLock::new();
@@ -1290,23 +1290,23 @@ mod tests {
         // child task must have finished by the time try returns
         do lock_rwlock_in_mode(x, mode2) { }
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_rwlock_reader_killed_writer() {
         rwlock_kill_helper(Read, Write);
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_rwlock_writer_killed_reader() {
         rwlock_kill_helper(Write,Read );
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_rwlock_reader_killed_reader() {
         rwlock_kill_helper(Read, Read );
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_rwlock_writer_killed_writer() {
         rwlock_kill_helper(Write,Write);
     }
-    #[test]
+    #[test] #[ignore(cfg(windows))]
     fn test_rwlock_kill_downgrader() {
         rwlock_kill_helper(Downgrade, Read);
         rwlock_kill_helper(Read, Downgrade);
@@ -1321,7 +1321,7 @@ mod tests {
         rwlock_kill_helper(Downgrade, DowngradeRead);
         rwlock_kill_helper(Downgrade, DowngradeRead);
     }
-    #[test] #[should_fail]
+    #[test] #[should_fail] #[ignore(cfg(windows))]
     fn test_rwlock_downgrade_cant_swap() {
         // Tests that you can't downgrade with a different rwlock's token.
         let x = ~RWLock::new();

branches/try2/src/libextra/test.rs

@@ -1163,6 +1163,7 @@ mod tests {
     }
 
     #[test]
+    #[ignore(cfg(windows))]
     fn test_should_fail() {
         fn f() { fail!(); }
         let desc = TestDescAndFn {

branches/try2/src/librustc/back/link.rs

@@ -419,8 +419,16 @@ pub mod write {
         }
     }
 
-    pub fn run_assembler(sess: Session, assembly: &Path, object: &Path) {
-        let cc_prog = super::get_cc_prog(sess);
+    pub fn run_ndk(sess: Session, assembly: &Path, object: &Path) {
+        let cc_prog: ~str = match &sess.opts.android_cross_path {
+            &Some(ref path) => {
+                fmt!("%s/bin/arm-linux-androideabi-gcc", *path)
+            }
+            &None => {
+                sess.fatal("need Android NDK path for building \
+                            (--android-cross-path)")
+            }
+        };
 
         let cc_args = ~[
             ~"-c",
@@ -805,14 +813,18 @@ pub fn output_dll_filename(os: session::os, lm: LinkMeta) -> ~str {
     fmt!("%s%s-%s-%s%s", dll_prefix, lm.name, lm.extras_hash, lm.vers, dll_suffix)
 }
 
-pub fn get_cc_prog(sess: Session) -> ~str {
+// If the user wants an exe generated we need to invoke
+// cc to link the object file with some libs
+pub fn link_binary(sess: Session,
+                   obj_filename: &Path,
+                   out_filename: &Path,
+                   lm: LinkMeta) {
     // In the future, FreeBSD will use clang as default compiler.
     // It would be flexible to use cc (system's default C compiler)
     // instead of hard-coded gcc.
-    // For win32, there is no cc command, so we add a condition to make it use g++.
-    // We use g++ rather than gcc because it automatically adds linker options required
-    // for generation of dll modules that correctly register stack unwind tables.
-    match sess.opts.linker {
+    // For win32, there is no cc command,
+    // so we add a condition to make it use gcc.
+    let cc_prog: ~str = match sess.opts.linker {
         Some(ref linker) => linker.to_str(),
         None => match sess.targ_cfg.os {
             session::os_android =>
@@ -825,22 +837,13 @@ pub fn get_cc_prog(sess: Session) -> ~str {
                                     (--android-cross-path)")
                     }
                 },
-            session::os_win32 => ~"g++",
+            session::os_win32 => ~"gcc",
             _ => ~"cc"
         }
-    }
-}
-
-// If the user wants an exe generated we need to invoke
-// cc to link the object file with some libs
-pub fn link_binary(sess: Session,
-                   obj_filename: &Path,
-                   out_filename: &Path,
-                   lm: LinkMeta) {
-
-    let cc_prog = get_cc_prog(sess);
+    };
     // The invocations of cc share some flags across platforms
 
+
     let output = if *sess.building_library {
         let long_libname = output_dll_filename(sess.targ_cfg.os, lm);
         debug!("link_meta.name:  %s", lm.name);