Skip to content

Commit a5d95ee

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 80751 b: refs/heads/try c: a7215dd h: refs/heads/master i: 80749: 609d851 80747: eadae78 80743: 4aa72ea 80735: 1800463 v: v3
1 parent 48285ce commit a5d95ee

File tree

22 files changed

+498
-669
lines changed

22 files changed

+498
-669
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
5-
refs/heads/try: 24fdb1d102eaa062a8a6213ec28803885192a694
5+
refs/heads/try: a7215dd284a1d2e15ecbe0c71b7c978fcba5e3ec
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/doc/rustpkg.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@ A valid workspace must contain each of the following subdirectories:
5252
rustpkg will install libraries for bar to `foo/lib/x86_64-apple-darwin/`.
5353
The libraries will have names of the form `foo/lib/x86_64-apple-darwin/libbar-[hash].dylib`,
5454
where [hash] is a hash of the package ID.
55-
* 'bin/': `rustpkg install` installs executable binaries into this directory.
55+
* 'bin/': `rustpkg install` installs executable binaries into a target-specific subdirectory of this directory.
5656

57-
For example, rustpkg will install executables for `bar` to
58-
`foo/bin`.
59-
The executables will have names of the form `foo/bin/bar`.
57+
For example, on a 64-bit machine running Mac OS X,
58+
if `foo` is a workspace, containing the package `bar`,
59+
rustpkg will install executables for `bar` to
60+
`foo/bin/x86_64-apple-darwin/`.
61+
The executables will have names of the form `foo/bin/x86_64-apple-darwin/bar`.
6062
* 'build/': `rustpkg build` stores temporary build artifacts in a target-specific subdirectory of this directory.
6163

6264
For example, on a 64-bit machine running Mac OS X,
@@ -83,12 +85,6 @@ rustpkg also interprets any dependencies on such a package ID literally
8385
Thus, `github.com/mozilla/rust#5c4cd30f80` is also a valid package ID,
8486
since git can deduce that 5c4cd30f80 refers to a revision of the desired repository.
8587

86-
A package identifier can name a subdirectory of another package.
87-
For example, if `foo` is a workspace, and `foo/src/bar/lib.rs` exists,
88-
as well as `foo/src/bar/extras/baz/lib.rs`,
89-
then both `bar` and `bar/extras/baz` are valid package identifiers
90-
in the workspace `foo`.
91-
9288
## Source files
9389

9490
rustpkg searches for four different fixed filenames in order to determine the crates to build:
@@ -144,11 +140,9 @@ but not in their `lib` or `bin` directories.
144140

145141
## install
146142

147-
`rustpkg install foo` builds the libraries and/or executables that are targets for `foo`.
148-
If `RUST_PATH` is declared as an environment variable, then rustpkg installs the
149-
libraries and executables into the `lib` and `bin` subdirectories
150-
of the first entry in `RUST_PATH`.
151-
Otherwise, it installs them into `foo`'s `lib` and `bin` directories.
143+
`rustpkg install foo` builds the libraries and/or executables that are targets for `foo`,
144+
and then installs them either into `foo`'s `lib` and `bin` directories,
145+
or into the `lib` and `bin` subdirectories of the first entry in `RUST_PATH`.
152146

153147
## test
154148

‎branches/try/mk/rt.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ RUNTIME_CXXS_$(1)_$(2) := \
7575
rt/rust_rng.cpp \
7676
rt/rust_upcall.cpp \
7777
rt/rust_uv.cpp \
78+
rt/rust_crate_map.cpp \
7879
rt/isaac/randport.cpp \
7980
rt/miniz.cpp \
8081
rt/memory_region.cpp \

‎branches/try/src/libextra/fileinput.rs

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -417,23 +417,20 @@ mod test {
417417

418418
use super::{FileInput, make_path_option_vec, input_vec, input_vec_state};
419419

420-
use std::rt::io;
421-
use std::rt::io::Writer;
422-
use std::rt::io::file;
420+
use std::io;
423421
use std::uint;
424422
use std::vec;
425423

426424
fn make_file(path : &Path, contents: &[~str]) {
427-
let mut file = file::open(path, io::CreateOrTruncate, io::Write).unwrap();
425+
let file = io::file_writer(path, [io::Create, io::Truncate]).unwrap();
428426

429427
for str in contents.iter() {
430-
file.write(str.as_bytes());
431-
file.write(['\n' as u8]);
428+
file.write_str(*str);
429+
file.write_char('\n');
432430
}
433431
}
434432

435433
#[test]
436-
#[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
437434
fn test_make_path_option_vec() {
438435
let strs = [~"some/path",
439436
~"some/other/path"];
@@ -448,7 +445,6 @@ mod test {
448445
}
449446
450447
#[test]
451-
#[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
452448
fn test_fileinput_read_byte() {
453449
let filenames = make_path_option_vec(vec::from_fn(
454450
3,
@@ -479,7 +475,6 @@ mod test {
479475
}
480476
481477
#[test]
482-
#[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
483478
fn test_fileinput_read() {
484479
let filenames = make_path_option_vec(vec::from_fn(
485480
3,
@@ -500,7 +495,6 @@ mod test {
500495
}
501496

502497
#[test]
503-
#[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
504498
fn test_input_vec() {
505499
let mut all_lines = ~[];
506500
let filenames = make_path_option_vec(vec::from_fn(
@@ -524,7 +518,6 @@ mod test {
524518
}
525519

526520
#[test]
527-
#[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
528521
fn test_input_vec_state() {
529522
let filenames = make_path_option_vec(vec::from_fn(
530523
3,
@@ -547,7 +540,6 @@ mod test {
547540
}
548541

549542
#[test]
550-
#[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
551543
fn test_empty_files() {
552544
let filenames = make_path_option_vec(vec::from_fn(
553545
3,
@@ -572,21 +564,18 @@ mod test {
572564
}
573565
574566
#[test]
575-
#[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
576567
fn test_no_trailing_newline() {
577568
let f1 =
578569
Some(Path("tmp/lib-fileinput-test-no-trailing-newline-1.tmp"));
579570
let f2 =
580571
Some(Path("tmp/lib-fileinput-test-no-trailing-newline-2.tmp"));
581572
582-
{
583-
let mut wr = file::open(f1.get_ref(), io::CreateOrTruncate,
584-
io::Write).unwrap();
585-
wr.write("1\n2".as_bytes());
586-
let mut wr = file::open(f2.get_ref(), io::CreateOrTruncate,
587-
io::Write).unwrap();
588-
wr.write("3\n4".as_bytes());
589-
}
573+
let wr = io::file_writer(f1.get_ref(),
574+
[io::Create, io::Truncate]).unwrap();
575+
wr.write_str("1\n2");
576+
let wr = io::file_writer(f2.get_ref(),
577+
[io::Create, io::Truncate]).unwrap();
578+
wr.write_str("3\n4");
590579
591580
let mut lines = ~[];
592581
do input_vec(~[f1, f2]) |line| {
@@ -598,7 +587,6 @@ mod test {
598587
599588
600589
#[test]
601-
#[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
602590
fn test_next_file() {
603591
let filenames = make_path_option_vec(vec::from_fn(
604592
3,
@@ -630,7 +618,6 @@ mod test {
630618
631619
#[test]
632620
#[should_fail]
633-
#[ignore(cfg(windows))] // FIXME(#8810): rt::io::file and windows don't agree
634621
fn test_input_vec_missing_file() {
635622
do input_vec(make_path_option_vec([~"this/file/doesnt/exist"], true)) |line| {
636623
println(line);

‎branches/try/src/libextra/glob.rs

Lines changed: 0 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -516,194 +516,6 @@ mod test {
516516
use super::*;
517517
use tempfile;
518518
519-
#[test]
520-
fn test_relative_pattern() {
521-
522-
fn change_then_remove(p: &Path, f: &fn()) {
523-
do (|| {
524-
unstable::change_dir_locked(p, || f());
525-
}).finally {
526-
os::remove_dir_recursive(p);
527-
}
528-
}
529-
530-
fn mk_file(path: &str, directory: bool) {
531-
if directory {
532-
os::make_dir(&Path(path), 0xFFFF);
533-
} else {
534-
io::mk_file_writer(&Path(path), [io::Create]);
535-
}
536-
}
537-
538-
fn abs_path(path: &str) -> Path {
539-
os::getcwd().push_many(Path(path).components)
540-
}
541-
542-
fn glob_vec(pattern: &str) -> ~[Path] {
543-
glob(pattern).collect()
544-
}
545-
546-
let root = tempfile::mkdtemp(&os::tmpdir(), "glob-tests");
547-
let root = root.expect("Should have created a temp directory");
548-
549-
do change_then_remove(&root) {
550-
551-
mk_file("aaa", true);
552-
mk_file("aaa/apple", true);
553-
mk_file("aaa/orange", true);
554-
mk_file("aaa/tomato", true);
555-
mk_file("aaa/tomato/tomato.txt", false);
556-
mk_file("aaa/tomato/tomoto.txt", false);
557-
mk_file("bbb", true);
558-
mk_file("bbb/specials", true);
559-
mk_file("bbb/specials/!", false);
560-
561-
// windows does not allow `*` or `?` characters to exist in filenames
562-
if os::consts::FAMILY != os::consts::windows::FAMILY {
563-
mk_file("bbb/specials/*", false);
564-
mk_file("bbb/specials/?", false);
565-
}
566-
567-
mk_file("bbb/specials/[", false);
568-
mk_file("bbb/specials/]", false);
569-
mk_file("ccc", true);
570-
mk_file("xyz", true);
571-
mk_file("xyz/x", false);
572-
mk_file("xyz/y", false);
573-
mk_file("xyz/z", false);
574-
575-
assert_eq!(glob_vec(""), ~[]);
576-
assert_eq!(glob_vec("."), ~[]);
577-
assert_eq!(glob_vec(".."), ~[]);
578-
579-
assert_eq!(glob_vec("aaa"), ~[abs_path("aaa")]);
580-
assert_eq!(glob_vec("aaa/"), ~[abs_path("aaa")]);
581-
assert_eq!(glob_vec("a"), ~[]);
582-
assert_eq!(glob_vec("aa"), ~[]);
583-
assert_eq!(glob_vec("aaaa"), ~[]);
584-
585-
assert_eq!(glob_vec("aaa/apple"), ~[abs_path("aaa/apple")]);
586-
assert_eq!(glob_vec("aaa/apple/nope"), ~[]);
587-
588-
// windows should support both / and \ as directory separators
589-
if os::consts::FAMILY == os::consts::windows::FAMILY {
590-
assert_eq!(glob_vec("aaa\\apple"), ~[abs_path("aaa/apple")]);
591-
}
592-
593-
assert_eq!(glob_vec("???/"), ~[
594-
abs_path("aaa"),
595-
abs_path("bbb"),
596-
abs_path("ccc"),
597-
abs_path("xyz")]);
598-
599-
assert_eq!(glob_vec("aaa/tomato/tom?to.txt"), ~[
600-
abs_path("aaa/tomato/tomato.txt"),
601-
abs_path("aaa/tomato/tomoto.txt")]);
602-
603-
assert_eq!(glob_vec("xyz/?"), ~[
604-
abs_path("xyz/x"),
605-
abs_path("xyz/y"),
606-
abs_path("xyz/z")]);
607-
608-
assert_eq!(glob_vec("a*"), ~[abs_path("aaa")]);
609-
assert_eq!(glob_vec("*a*"), ~[abs_path("aaa")]);
610-
assert_eq!(glob_vec("a*a"), ~[abs_path("aaa")]);
611-
assert_eq!(glob_vec("aaa*"), ~[abs_path("aaa")]);
612-
assert_eq!(glob_vec("*aaa"), ~[abs_path("aaa")]);
613-
assert_eq!(glob_vec("*aaa*"), ~[abs_path("aaa")]);
614-
assert_eq!(glob_vec("*a*a*a*"), ~[abs_path("aaa")]);
615-
assert_eq!(glob_vec("aaa*/"), ~[abs_path("aaa")]);
616-
617-
assert_eq!(glob_vec("aaa/*"), ~[
618-
abs_path("aaa/apple"),
619-
abs_path("aaa/orange"),
620-
abs_path("aaa/tomato")]);
621-
622-
assert_eq!(glob_vec("aaa/*a*"), ~[
623-
abs_path("aaa/apple"),
624-
abs_path("aaa/orange"),
625-
abs_path("aaa/tomato")]);
626-
627-
assert_eq!(glob_vec("*/*/*.txt"), ~[
628-
abs_path("aaa/tomato/tomato.txt"),
629-
abs_path("aaa/tomato/tomoto.txt")]);
630-
631-
assert_eq!(glob_vec("*/*/t[aob]m?to[.]t[!y]t"), ~[
632-
abs_path("aaa/tomato/tomato.txt"),
633-
abs_path("aaa/tomato/tomoto.txt")]);
634-
635-
assert_eq!(glob_vec("aa[a]"), ~[abs_path("aaa")]);
636-
assert_eq!(glob_vec("aa[abc]"), ~[abs_path("aaa")]);
637-
assert_eq!(glob_vec("a[bca]a"), ~[abs_path("aaa")]);
638-
assert_eq!(glob_vec("aa[b]"), ~[]);
639-
assert_eq!(glob_vec("aa[xyz]"), ~[]);
640-
assert_eq!(glob_vec("aa[]]"), ~[]);
641-
642-
assert_eq!(glob_vec("aa[!b]"), ~[abs_path("aaa")]);
643-
assert_eq!(glob_vec("aa[!bcd]"), ~[abs_path("aaa")]);
644-
assert_eq!(glob_vec("a[!bcd]a"), ~[abs_path("aaa")]);
645-
assert_eq!(glob_vec("aa[!a]"), ~[]);
646-
assert_eq!(glob_vec("aa[!abc]"), ~[]);
647-
648-
assert_eq!(glob_vec("bbb/specials/[[]"), ~[abs_path("bbb/specials/[")]);
649-
assert_eq!(glob_vec("bbb/specials/!"), ~[abs_path("bbb/specials/!")]);
650-
assert_eq!(glob_vec("bbb/specials/[]]"), ~[abs_path("bbb/specials/]")]);
651-
652-
if os::consts::FAMILY != os::consts::windows::FAMILY {
653-
assert_eq!(glob_vec("bbb/specials/[*]"), ~[abs_path("bbb/specials/*")]);
654-
assert_eq!(glob_vec("bbb/specials/[?]"), ~[abs_path("bbb/specials/?")]);
655-
}
656-
657-
if os::consts::FAMILY == os::consts::windows::FAMILY {
658-
659-
assert_eq!(glob_vec("bbb/specials/[![]"), ~[
660-
abs_path("bbb/specials/!"),
661-
abs_path("bbb/specials/]")]);
662-
663-
assert_eq!(glob_vec("bbb/specials/[!]]"), ~[
664-
abs_path("bbb/specials/!"),
665-
abs_path("bbb/specials/[")]);
666-
667-
assert_eq!(glob_vec("bbb/specials/[!!]"), ~[
668-
abs_path("bbb/specials/["),
669-
abs_path("bbb/specials/]")]);
670-
671-
} else {
672-
673-
assert_eq!(glob_vec("bbb/specials/[![]"), ~[
674-
abs_path("bbb/specials/!"),
675-
abs_path("bbb/specials/*"),
676-
abs_path("bbb/specials/?"),
677-
abs_path("bbb/specials/]")]);
678-
679-
assert_eq!(glob_vec("bbb/specials/[!]]"), ~[
680-
abs_path("bbb/specials/!"),
681-
abs_path("bbb/specials/*"),
682-
abs_path("bbb/specials/?"),
683-
abs_path("bbb/specials/[")]);
684-
685-
assert_eq!(glob_vec("bbb/specials/[!!]"), ~[
686-
abs_path("bbb/specials/*"),
687-
abs_path("bbb/specials/?"),
688-
abs_path("bbb/specials/["),
689-
abs_path("bbb/specials/]")]);
690-
691-
assert_eq!(glob_vec("bbb/specials/[!*]"), ~[
692-
abs_path("bbb/specials/!"),
693-
abs_path("bbb/specials/?"),
694-
abs_path("bbb/specials/["),
695-
abs_path("bbb/specials/]")]);
696-
697-
assert_eq!(glob_vec("bbb/specials/[!?]"), ~[
698-
abs_path("bbb/specials/!"),
699-
abs_path("bbb/specials/*"),
700-
abs_path("bbb/specials/["),
701-
abs_path("bbb/specials/]")]);
702-
703-
}
704-
};
705-
}
706-
707519
#[test]
708520
fn test_absolute_pattern() {
709521
// assume that the filesystem is not empty!

0 commit comments

Comments
 (0)