---

yaml
---
r: 77044
b: refs/heads/snap-stage3
c: fca7519
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: f1132496dddbdd88f321a7919eec3d65136b3f75
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 996989cdb4c936ee3e41e65e6cd4d22c073206f9
+refs/heads/snap-stage3: fca75199c7b2186e64fcab51a9e498695ce4a7b8
 refs/heads/try: ebfe63cd1c0b5d23f7ea60c69b4fde2e30cfd42a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/fileinput.rs

@@ -27,7 +27,7 @@ reset once it has been finished, so attempting to iterate on `[None,
 None]` will only take input once unless `io::stdin().seek(0, SeekSet)`
 is called between.
 
-The `make_path_option_vec` function handles converting a list of file paths as
+The `pathify` function handles converting a list of file paths as
 strings to the appropriate format, including the (optional) conversion
 of `"-"` to `stdin`.
 
@@ -42,7 +42,7 @@ to handle any `FileInput` structs. E.g. a simple `cat` program
 
 or a program that numbers lines after concatenating two files
 
-    for input_vec_state(make_path_option_vec([~"a.txt", ~"b.txt"])) |line, state| {
+    for input_vec_state(pathify([~"a.txt", ~"b.txt"])) |line, state| {
         io::println(fmt!("%u: %s", state.line_num,
                                    line));
     }
@@ -145,14 +145,8 @@ struct FileInput_ {
     previous_was_newline: bool
 }
 
-
-// FIXME #5723: remove this when Reader has &mut self.
-// Removing it would mean giving read_byte in the Reader impl for
-// FileInput &mut self, which in turn means giving most of the
-// io::Reader trait methods &mut self. That can't be done right now
-// because of io::with_bytes_reader and #5723.
-// Should be removable via
-// "self.fi" -> "self." and renaming FileInput_. Documentation above
+// XXX: remove this when Reader has &mut self. Should be removable via
+// "self.fi." -> "self." and renaming FileInput_. Documentation above
 // will likely have to be updated to use `let mut in = ...`.
 pub struct FileInput  {
     fi: @mut FileInput_
@@ -200,7 +194,7 @@ impl FileInput {
     */
     pub fn from_args() -> FileInput {
         let args = os::args();
-        let pathed = make_path_option_vec(args.tail(), true);
+        let pathed = pathify(args.tail(), true);
         FileInput::from_vec(pathed)
     }
 
@@ -357,7 +351,8 @@ Convert a list of strings to an appropriate form for a `FileInput`
 instance. `stdin_hyphen` controls whether `-` represents `stdin` or
 a literal `-`.
 */
-pub fn make_path_option_vec(vec: &[~str], stdin_hyphen : bool) -> ~[Option<Path>] {
+// XXX: stupid, unclear name
+pub fn pathify(vec: &[~str], stdin_hyphen : bool) -> ~[Option<Path>] {
     vec.iter().map(|str| {
         if stdin_hyphen && "-" == *str {
             None
@@ -415,7 +410,7 @@ pub fn input_vec_state(files: ~[Option<Path>],
 #[cfg(test)]
 mod test {
 
-    use super::{FileInput, make_path_option_vec, input_vec, input_vec_state};
+    use super::{FileInput, pathify, input_vec, input_vec_state};
 
     use std::io;
     use std::uint;
@@ -431,22 +426,22 @@ mod test {
     }
 
     #[test]
-    fn test_make_path_option_vec() {
+    fn test_pathify() {
         let strs = [~"some/path",
                     ~"some/other/path"];
         let paths = ~[Some(Path("some/path")),
                       Some(Path("some/other/path"))];
 
-        assert_eq!(make_path_option_vec(strs, true), paths.clone());
-        assert_eq!(make_path_option_vec(strs, false), paths);
+        assert_eq!(pathify(strs, true), paths.clone());
+        assert_eq!(pathify(strs, false), paths);
 
-        assert_eq!(make_path_option_vec([~"-"], true), ~[None]);
-        assert_eq!(make_path_option_vec([~"-"], false), ~[Some(Path("-"))]);
+        assert_eq!(pathify([~"-"], true), ~[None]);
+        assert_eq!(pathify([~"-"], false), ~[Some(Path("-"))]);
     }
 
     #[test]
     fn test_fileinput_read_byte() {
-        let filenames = make_path_option_vec(vec::from_fn(
+        let filenames = pathify(vec::from_fn(
             3,
             |i| fmt!("tmp/lib-fileinput-test-fileinput-read-byte-%u.tmp", i)), true);
 
@@ -476,7 +471,7 @@ mod test {
 
     #[test]
     fn test_fileinput_read() {
-        let filenames = make_path_option_vec(vec::from_fn(
+        let filenames = pathify(vec::from_fn(
             3,
             |i| fmt!("tmp/lib-fileinput-test-fileinput-read-%u.tmp", i)), true);
 
@@ -497,7 +492,7 @@ mod test {
     #[test]
     fn test_input_vec() {
         let mut all_lines = ~[];
-        let filenames = make_path_option_vec(vec::from_fn(
+        let filenames = pathify(vec::from_fn(
             3,
             |i| fmt!("tmp/lib-fileinput-test-input-vec-%u.tmp", i)), true);
 
@@ -519,7 +514,7 @@ mod test {
 
     #[test]
     fn test_input_vec_state() {
-        let filenames = make_path_option_vec(vec::from_fn(
+        let filenames = pathify(vec::from_fn(
             3,
             |i| fmt!("tmp/lib-fileinput-test-input-vec-state-%u.tmp", i)),true);
 
@@ -541,7 +536,7 @@ mod test {
 
     #[test]
     fn test_empty_files() {
-        let filenames = make_path_option_vec(vec::from_fn(
+        let filenames = pathify(vec::from_fn(
             3,
             |i| fmt!("tmp/lib-fileinput-test-empty-files-%u.tmp", i)),true);
 
@@ -588,7 +583,7 @@ mod test {
 
     #[test]
     fn test_next_file() {
-        let filenames = make_path_option_vec(vec::from_fn(
+        let filenames = pathify(vec::from_fn(
             3,
             |i| fmt!("tmp/lib-fileinput-test-next-file-%u.tmp", i)),true);
 
@@ -619,7 +614,7 @@ mod test {
     #[test]
     #[should_fail]
     fn test_input_vec_missing_file() {
-        do input_vec(make_path_option_vec([~"this/file/doesnt/exist"], true)) |line| {
+        do input_vec(pathify([~"this/file/doesnt/exist"], true)) |line| {
             println(line);
             true
         };

branches/snap-stage3/src/libextra/flatpipes.rs

@@ -564,10 +564,8 @@ pub mod bytepipes {
         }
     }
 
-    // FIXME #6850: Remove `@mut` when this module is ported to the new I/O traits,
-    // which use `&mut self` properly. (For example, util::comm::GenericPort's try_recv
-    // method doesn't use `&mut self`, so the `try_recv` method in the impl of `BytePort`
-    // for `PipeBytePort` can't have `&mut self` either.)
+    // XXX: Remove `@mut` when this module is ported to the new I/O traits,
+    // which use `&mut self` properly.
     pub struct PipeBytePort {
         port: comm::Port<~[u8]>,
         buf: @mut ~[u8]

branches/snap-stage3/src/libextra/io_util.rs

@@ -30,7 +30,7 @@ impl BufReader {
     }
 
     fn as_bytes_reader<A>(&self, f: &fn(&BytesReader) -> A) -> A {
-        // FIXME(#5723)
+        // XXX FIXME(#5723)
         let bytes = ::std::util::id::<&[u8]>(self.buf);
         let bytes: &'static [u8] = unsafe { cast::transmute(bytes) };
         // Recreating the BytesReader state every call since

branches/snap-stage3/src/librustc/back/link.rs

@@ -26,6 +26,7 @@ use std::c_str::ToCStr;
 use std::char;
 use std::hash::Streaming;
 use std::hash;
+use std::io;
 use std::libc::{c_int, c_uint};
 use std::os::consts::{macos, freebsd, linux, android, win32};
 use std::os;
@@ -858,6 +859,10 @@ pub fn link_binary(sess: Session,
     debug!("output: %s", output.to_str());
     let cc_args = link_args(sess, obj_filename, out_filename, lm);
     debug!("%s link args: %s", cc_prog, cc_args.connect(" "));
+    if (sess.opts.debugging_opts & session::print_link_args) != 0 {
+        io::println(fmt!("%s link args: %s", cc_prog, cc_args.connect(" ")));
+    }
+
     // We run 'cc' here
     let prog = run::process_output(cc_prog, cc_args);
     if 0 != prog.status {