---

yaml
---
r: 145051
b: refs/heads/try2
c: 2aa578e
h: refs/heads/master
i:
  145049: e3cf3d4
  145047: c85e1c8
v: v3

Author: bors

[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: 93683ae6da3a47f1cd0644a093cb4b1b0bee7faa
+refs/heads/try2: 2aa578efd9834e37ad52879ff10ee2c2aa938389
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/rustpkg.md

@@ -52,13 +52,11 @@ A valid workspace must contain each of the following subdirectories:
      rustpkg will install libraries for bar to `foo/lib/x86_64-apple-darwin/`.
      The libraries will have names of the form `foo/lib/x86_64-apple-darwin/libbar-[hash].dylib`,
      where [hash] is a hash of the package ID.
-* 'bin/': `rustpkg install` installs executable binaries into a target-specific subdirectory of this directory.
+* 'bin/': `rustpkg install` installs executable binaries into this directory.
 
-     For example, on a 64-bit machine running Mac OS X,
-     if `foo` is a workspace, containing the package `bar`,
-     rustpkg will install executables for `bar` to
-     `foo/bin/x86_64-apple-darwin/`.
-     The executables will have names of the form `foo/bin/x86_64-apple-darwin/bar`.
+     For example, rustpkg will install executables for `bar` to
+     `foo/bin`.
+     The executables will have names of the form `foo/bin/bar`.
 * 'build/': `rustpkg build` stores temporary build artifacts in a target-specific subdirectory of this directory.
 
      For example, on a 64-bit machine running Mac OS X,
@@ -85,6 +83,12 @@ rustpkg also interprets any dependencies on such a package ID literally
 Thus, `github.com/mozilla/rust#5c4cd30f80` is also a valid package ID,
 since git can deduce that 5c4cd30f80 refers to a revision of the desired repository.
 
+A package identifier can name a subdirectory of another package.
+For example, if `foo` is a workspace, and `foo/src/bar/lib.rs` exists,
+as well as `foo/src/bar/extras/baz/lib.rs`,
+then both `bar` and `bar/extras/baz` are valid package identifiers
+in the workspace `foo`.
+
 ## Source files
 
 rustpkg searches for four different fixed filenames in order to determine the crates to build:
@@ -140,9 +144,11 @@ but not in their `lib` or `bin` directories.
 
 ## install
 
-`rustpkg install foo` builds the libraries and/or executables that are targets for `foo`,
-and then installs them either into `foo`'s `lib` and `bin` directories,
-or into the `lib` and `bin` subdirectories of the first entry in `RUST_PATH`.
+`rustpkg install foo` builds the libraries and/or executables that are targets for `foo`.
+If `RUST_PATH` is declared as an environment variable, then rustpkg installs the
+libraries and executables into the `lib` and `bin` subdirectories
+of the first entry in `RUST_PATH`.
+Otherwise, it installs them into `foo`'s `lib` and `bin` directories.
 
 ## test
 

branches/try2/mk/rt.mk

@@ -75,7 +75,6 @@ RUNTIME_CXXS_$(1)_$(2) := \
               rt/rust_rng.cpp \
               rt/rust_upcall.cpp \
               rt/rust_uv.cpp \
-              rt/rust_crate_map.cpp \
               rt/isaac/randport.cpp \
               rt/miniz.cpp \
               rt/memory_region.cpp \

branches/try2/src/libextra/fileinput.rs

@@ -417,20 +417,23 @@ mod test {
 
     use super::{FileInput, make_path_option_vec, input_vec, input_vec_state};
 
-    use std::io;
+    use std::rt::io;
+    use std::rt::io::Writer;
+    use std::rt::io::file;
     use std::uint;
     use std::vec;
 
     fn make_file(path : &Path, contents: &[~str]) {
-        let file = io::file_writer(path, [io::Create, io::Truncate]).unwrap();
+        let mut file = file::open(path, io::CreateOrTruncate, io::Write).unwrap();
 
         for str in contents.iter() {
-            file.write_str(*str);
-            file.write_char('\n');
+            file.write(str.as_bytes());
+            file.write(['\n' as u8]);
         }
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_make_path_option_vec() {
         let strs = [~"some/path",
                     ~"some/other/path"];
@@ -445,6 +448,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_fileinput_read_byte() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -475,6 +479,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_fileinput_read() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -495,6 +500,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_input_vec() {
         let mut all_lines = ~[];
         let filenames = make_path_option_vec(vec::from_fn(
@@ -518,6 +524,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_input_vec_state() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -540,6 +547,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_empty_files() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -564,18 +572,21 @@ mod test {
     }
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_no_trailing_newline() {
         let f1 =
             Some(Path("tmp/lib-fileinput-test-no-trailing-newline-1.tmp"));
         let f2 =
             Some(Path("tmp/lib-fileinput-test-no-trailing-newline-2.tmp"));
 
-        let wr = io::file_writer(f1.get_ref(),
-                                 [io::Create, io::Truncate]).unwrap();
-        wr.write_str("1\n2");
-        let wr = io::file_writer(f2.get_ref(),
-                                 [io::Create, io::Truncate]).unwrap();
-        wr.write_str("3\n4");
+        {
+            let mut wr = file::open(f1.get_ref(), io::CreateOrTruncate,
+                                    io::Write).unwrap();
+            wr.write("1\n2".as_bytes());
+            let mut wr = file::open(f2.get_ref(), io::CreateOrTruncate,
+                                    io::Write).unwrap();
+            wr.write("3\n4".as_bytes());
+        }
 
         let mut lines = ~[];
         do input_vec(~[f1, f2]) |line| {
@@ -587,6 +598,7 @@ mod test {
 
 
     #[test]
+    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_next_file() {
         let filenames = make_path_option_vec(vec::from_fn(
             3,
@@ -618,6 +630,7 @@ mod test {
 
     #[test]
     #[should_fail]
+    #[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
     fn test_input_vec_missing_file() {
         do input_vec(make_path_option_vec([~"this/file/doesnt/exist"], true)) |line| {
             println(line);

branches/try2/src/libextra/glob.rs

@@ -556,194 +556,6 @@ mod test {
     use super::*;
     use tempfile;
 
-    #[test]
-    fn test_relative_pattern() {
-
-        fn change_then_remove(p: &Path, f: &fn()) {
-            do (|| {
-                unstable::change_dir_locked(p, || f());
-            }).finally {
-                os::remove_dir_recursive(p);
-            }
-        }
-
-        fn mk_file(path: &str, directory: bool) {
-            if directory {
-                os::make_dir(&Path(path), 0xFFFF);
-            } else {
-                io::mk_file_writer(&Path(path), [io::Create]);
-            }
-        }
-
-        fn abs_path(path: &str) -> Path {
-            os::getcwd().push_many(Path(path).components)
-        }
-
-        fn glob_vec(pattern: &str) -> ~[Path] {
-            glob(pattern).collect()
-        }
-
-        let root = tempfile::mkdtemp(&os::tmpdir(), "glob-tests");
-        let root = root.expect("Should have created a temp directory");
-
-        do change_then_remove(&root) {
-
-            mk_file("aaa", true);
-            mk_file("aaa/apple", true);
-            mk_file("aaa/orange", true);
-            mk_file("aaa/tomato", true);
-            mk_file("aaa/tomato/tomato.txt", false);
-            mk_file("aaa/tomato/tomoto.txt", false);
-            mk_file("bbb", true);
-            mk_file("bbb/specials", true);
-            mk_file("bbb/specials/!", false);
-
-            // windows does not allow `*` or `?` characters to exist in filenames
-            if os::consts::FAMILY != os::consts::windows::FAMILY {
-                mk_file("bbb/specials/*", false);
-                mk_file("bbb/specials/?", false);
-            }
-
-            mk_file("bbb/specials/[", false);
-            mk_file("bbb/specials/]", false);
-            mk_file("ccc", true);
-            mk_file("xyz", true);
-            mk_file("xyz/x", false);
-            mk_file("xyz/y", false);
-            mk_file("xyz/z", false);
-
-            assert_eq!(glob_vec(""), ~[]);
-            assert_eq!(glob_vec("."), ~[]);
-            assert_eq!(glob_vec(".."), ~[]);
-
-            assert_eq!(glob_vec("aaa"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("aaa/"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("a"), ~[]);
-            assert_eq!(glob_vec("aa"), ~[]);
-            assert_eq!(glob_vec("aaaa"), ~[]);
-
-            assert_eq!(glob_vec("aaa/apple"), ~[abs_path("aaa/apple")]);
-            assert_eq!(glob_vec("aaa/apple/nope"), ~[]);
-
-            // windows should support both / and \ as directory separators
-            if os::consts::FAMILY == os::consts::windows::FAMILY {
-                assert_eq!(glob_vec("aaa\\apple"), ~[abs_path("aaa/apple")]);
-            }
-
-            assert_eq!(glob_vec("???/"), ~[
-                abs_path("aaa"),
-                abs_path("bbb"),
-                abs_path("ccc"),
-                abs_path("xyz")]);
-
-            assert_eq!(glob_vec("aaa/tomato/tom?to.txt"), ~[
-                abs_path("aaa/tomato/tomato.txt"),
-                abs_path("aaa/tomato/tomoto.txt")]);
-
-            assert_eq!(glob_vec("xyz/?"), ~[
-                abs_path("xyz/x"),
-                abs_path("xyz/y"),
-                abs_path("xyz/z")]);
-
-            assert_eq!(glob_vec("a*"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("*a*"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("a*a"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("aaa*"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("*aaa"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("*aaa*"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("*a*a*a*"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("aaa*/"), ~[abs_path("aaa")]);
-
-            assert_eq!(glob_vec("aaa/*"), ~[
-                abs_path("aaa/apple"),
-                abs_path("aaa/orange"),
-                abs_path("aaa/tomato")]);
-
-            assert_eq!(glob_vec("aaa/*a*"), ~[
-                abs_path("aaa/apple"),
-                abs_path("aaa/orange"),
-                abs_path("aaa/tomato")]);
-
-            assert_eq!(glob_vec("*/*/*.txt"), ~[
-                abs_path("aaa/tomato/tomato.txt"),
-                abs_path("aaa/tomato/tomoto.txt")]);
-
-            assert_eq!(glob_vec("*/*/t[aob]m?to[.]t[!y]t"), ~[
-                abs_path("aaa/tomato/tomato.txt"),
-                abs_path("aaa/tomato/tomoto.txt")]);
-
-            assert_eq!(glob_vec("aa[a]"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("aa[abc]"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("a[bca]a"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("aa[b]"), ~[]);
-            assert_eq!(glob_vec("aa[xyz]"), ~[]);
-            assert_eq!(glob_vec("aa[]]"), ~[]);
-
-            assert_eq!(glob_vec("aa[!b]"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("aa[!bcd]"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("a[!bcd]a"), ~[abs_path("aaa")]);
-            assert_eq!(glob_vec("aa[!a]"), ~[]);
-            assert_eq!(glob_vec("aa[!abc]"), ~[]);
-
-            assert_eq!(glob_vec("bbb/specials/[[]"), ~[abs_path("bbb/specials/[")]);
-            assert_eq!(glob_vec("bbb/specials/!"), ~[abs_path("bbb/specials/!")]);
-            assert_eq!(glob_vec("bbb/specials/[]]"), ~[abs_path("bbb/specials/]")]);
-
-            if os::consts::FAMILY != os::consts::windows::FAMILY {
-                assert_eq!(glob_vec("bbb/specials/[*]"), ~[abs_path("bbb/specials/*")]);
-                assert_eq!(glob_vec("bbb/specials/[?]"), ~[abs_path("bbb/specials/?")]);
-            }
-
-            if os::consts::FAMILY == os::consts::windows::FAMILY {
-
-                assert_eq!(glob_vec("bbb/specials/[![]"), ~[
-                    abs_path("bbb/specials/!"),
-                    abs_path("bbb/specials/]")]);
-
-                assert_eq!(glob_vec("bbb/specials/[!]]"), ~[
-                    abs_path("bbb/specials/!"),
-                    abs_path("bbb/specials/[")]);
-
-                assert_eq!(glob_vec("bbb/specials/[!!]"), ~[
-                    abs_path("bbb/specials/["),
-                    abs_path("bbb/specials/]")]);
-
-            } else {
-
-                assert_eq!(glob_vec("bbb/specials/[![]"), ~[
-                    abs_path("bbb/specials/!"),
-                    abs_path("bbb/specials/*"),
-                    abs_path("bbb/specials/?"),
-                    abs_path("bbb/specials/]")]);
-
-                assert_eq!(glob_vec("bbb/specials/[!]]"), ~[
-                    abs_path("bbb/specials/!"),
-                    abs_path("bbb/specials/*"),
-                    abs_path("bbb/specials/?"),
-                    abs_path("bbb/specials/[")]);
-
-                assert_eq!(glob_vec("bbb/specials/[!!]"), ~[
-                    abs_path("bbb/specials/*"),
-                    abs_path("bbb/specials/?"),
-                    abs_path("bbb/specials/["),
-                    abs_path("bbb/specials/]")]);
-
-                assert_eq!(glob_vec("bbb/specials/[!*]"), ~[
-                    abs_path("bbb/specials/!"),
-                    abs_path("bbb/specials/?"),
-                    abs_path("bbb/specials/["),
-                    abs_path("bbb/specials/]")]);
-
-                assert_eq!(glob_vec("bbb/specials/[!?]"), ~[
-                    abs_path("bbb/specials/!"),
-                    abs_path("bbb/specials/*"),
-                    abs_path("bbb/specials/["),
-                    abs_path("bbb/specials/]")]);
-
-            }
-        };
-    }
-
     #[test]
     fn test_absolute_pattern() {
         // assume that the filesystem is not empty!