Merge pull request #524 from ebfe/fix-build

Fix build with rust master

Makefile

@@ -202,7 +202,7 @@ define CRATE_BUILD
 -include $(BUILDDIR)/$(1).d
 
 $(BUILDDIR)/$($(1)_RLIB): $(SRCDIR)/$(1)/$(1).rs | $(BUILDDIR) deps
-	$(RUSTC) $(RUSTCLIBFLAGS) --extern time=$(BUILDDIR)/libtime.rlib --extern regex=$(BUILDDIR)/libregex.rlib --extern serialize=$(BUILDDIR)/librustc-serialize.rlib --crate-type rlib --emit link,dep-info $$< --out-dir $(BUILDDIR)
+	$(RUSTC) $(RUSTCLIBFLAGS) --extern libc=$(BUILDDIR)/liblibc.rlib --extern time=$(BUILDDIR)/libtime.rlib --extern regex=$(BUILDDIR)/libregex.rlib --extern serialize=$(BUILDDIR)/librustc-serialize.rlib --crate-type rlib --emit link,dep-info $$< --out-dir $(BUILDDIR)
 endef
 
 # Aliases build rule
@@ -260,6 +260,7 @@ $(BUILDDIR)/.rust-crypto: | $(BUILDDIR)
 	cd $(BASEDIR)/deps/rust-crypto && $(CARGO) build --release
 	cp -r $(BASEDIR)/deps/rust-crypto/target/release/deps/librustc-serialize*.rlib $(BUILDDIR)/librustc-serialize.rlib
 	cp -r $(BASEDIR)/deps/rust-crypto/target/release/deps/libtime*.rlib $(BUILDDIR)/libtime.rlib
+	cp -r $(BASEDIR)/deps/rust-crypto/target/release/deps/liblibc*.rlib $(BUILDDIR)/liblibc.rlib
 	cp -r $(BASEDIR)/deps/rust-crypto/target/release/libcrypto*.rlib $(BUILDDIR)/libcrypto.rlib
 	@touch $@
 

mkmain.rs

@@ -1,7 +1,7 @@
 #![feature(core, io, os, path)]
 use std::old_io::{File, Truncate, ReadWrite};
 use std::os;
-use std::path::Path;
+use std::old_path::Path;
 
 static TEMPLATE: &'static str = "\
 #![feature(os)]

mkuutils.rs

@@ -2,7 +2,7 @@
 
 use std::old_io::{File, Truncate, Write};
 use std::os;
-use std::path::Path;
+use std::old_path::Path;
 
 fn main() {
     let args = os::args();

src/base64/base64.rs

@@ -1,5 +1,5 @@
 #![crate_name = "base64"]
-#![feature(collections, core, io, libc, path, rustc_private, std_misc)]
+#![feature(collections, core, io, path, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/basename/basename.rs

@@ -1,5 +1,5 @@
 #![crate_name = "basename"]
-#![feature(collections, core, io, libc, rustc_private)]
+#![feature(collections, core, io, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/cat/cat.rs

@@ -262,7 +262,7 @@ fn open(path: &str) -> Option<(Box<Reader>, bool)> {
         return Some((box stdin as Box<Reader>, interactive));
     }
 
-    match File::open(&std::path::Path::new(path)) {
+    match File::open(&std::old_path::Path::new(path)) {
         Ok(f) => Some((box f as Box<Reader>, false)),
         Err(e) => {
             (writeln!(&mut stderr(), "cat: {0}: {1}", path, e.to_string())).unwrap();

src/chmod/chmod.rs

@@ -1,5 +1,5 @@
 #![crate_name = "chmod"]
-#![feature(collections, core, io, libc, path, rustc_private, std_misc)]
+#![feature(collections, core, io, path, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/chroot/chroot.rs

@@ -1,5 +1,5 @@
 #![crate_name = "chroot"]
-#![feature(collections, core, io, libc, os, path, rustc_private, std_misc)]
+#![feature(collections, core, io, os, path, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/comm/comm.rs

@@ -16,7 +16,7 @@ use std::cmp::Ordering;
 use std::old_io::{BufferedReader, IoResult, print};
 use std::old_io::fs::File;
 use std::old_io::stdio::{stdin, StdinReader};
-use std::path::Path;
+use std::old_path::Path;
 
 static NAME : &'static str = "comm";
 static VERSION : &'static str = "1.0.0";

src/cut/cut.rs

@@ -1,5 +1,5 @@
 #![crate_name = "cut"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/dirname/dirname.rs

@@ -53,7 +53,7 @@ directory).", &opts).as_slice());
 
     if !matches.free.is_empty() {
         for path in matches.free.iter() {
-            let p = std::path::Path::new(path.clone());
+            let p = std::old_path::Path::new(path.clone());
             let d = std::str::from_utf8(p.dirname());
             if d.is_ok() {
                 print(d.unwrap());

src/du/du.rs

@@ -1,5 +1,5 @@
 #![crate_name = "du"]
-#![feature(collections, core, io, libc, path, rustc_private, std_misc, unicode)]
+#![feature(collections, core, io, path, rustc_private, std_misc, unicode)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -19,7 +19,7 @@ extern crate time;
 use std::old_io::{stderr, fs, FileStat, FileType};
 use std::num::Float;
 use std::option::Option;
-use std::path::Path;
+use std::old_path::Path;
 use std::sync::{Arc, Future};
 use time::Timespec;
 

src/echo/echo.rs

@@ -1,5 +1,5 @@
 #![crate_name = "echo"]
-#![feature(collections, core, io, libc, rustc_private)]
+#![feature(collections, core, io, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/expand/expand.rs

@@ -1,5 +1,5 @@
 #![crate_name = "expand"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/factor/factor.rs

@@ -1,5 +1,5 @@
 #![crate_name = "factor"]
-#![feature(collections, core, io, libc, rustc_private)]
+#![feature(collections, core, io, rustc_private)]
 
 /*
 * This file is part of the uutils coreutils package.

src/fmt/parasplit.rs

@@ -213,7 +213,7 @@ pub struct Paragraph {
 // an iterator producing a stream of paragraphs from a stream of lines
 // given a set of options.
 pub struct ParagraphStream<'a> {
-    lines     : Peekable<Line, FileLines<'a>>,
+    lines     : Peekable<FileLines<'a>>,
     next_mail : bool,
     opts      : &'a FmtOptions,
 }

src/fold/fold.rs

@@ -1,5 +1,5 @@
 #![crate_name = "fold"]
-#![feature(collections, core, io, libc, path, rustc_private, unicode)]
+#![feature(collections, core, io, path, rustc_private, unicode)]
 
 /*
  * This file is part of the uutils coreutils package.

src/head/head.rs

@@ -18,7 +18,7 @@ use std::char::CharExt;
 use std::old_io::{stdin};
 use std::old_io::{BufferedReader, BytesReader};
 use std::old_io::fs::File;
-use std::path::Path;
+use std::old_path::Path;
 use std::str::from_utf8;
 use getopts::{optopt, optflag, getopts, usage};
 

src/hostid/hostid.rs

@@ -1,5 +1,5 @@
 #![crate_name = "hostid"]
-#![feature(collections, core, libc, rustc_private)]
+#![feature(collections, core, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/hostname/hostname.rs

@@ -1,5 +1,5 @@
 #![crate_name = "hostname"]
-#![feature(collections, core, io, libc, rustc_private)]
+#![feature(collections, core, io, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/id/id.rs

@@ -1,5 +1,5 @@
 #![crate_name = "id"]
-#![feature(collections, core, libc, rustc_private, std_misc)]
+#![feature(collections, core, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/kill/kill.rs

@@ -1,5 +1,5 @@
 #![crate_name = "kill"]
-#![feature(collections, core, io, libc, rustc_private, unicode)]
+#![feature(collections, core, io, rustc_private, unicode)]
 
 /*
  * This file is part of the uutils coreutils package.

src/link/link.rs

@@ -13,7 +13,7 @@
 extern crate getopts;
 
 use std::old_io::fs::link;
-use std::path::Path;
+use std::old_path::Path;
 
 #[path="../common/util.rs"]
 #[macro_use]

src/logname/logname.rs

@@ -1,5 +1,5 @@
 #![crate_name = "logname"]
-#![feature(collections, core, io, libc, rustc_private, std_misc)]
+#![feature(collections, core, io, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/mkdir/mkdir.rs

@@ -1,5 +1,5 @@
 #![crate_name = "mkdir"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/mkfifo/mkfifo.rs

@@ -1,5 +1,5 @@
 #![crate_name = "mkfifo"]
-#![feature(collections, core, libc, rustc_private, std_misc)]
+#![feature(collections, core, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/mv/mv.rs

@@ -16,7 +16,7 @@ extern crate getopts;
 use std::old_io::{BufferedReader, IoResult, fs};
 use std::old_io::stdio::stdin_raw;
 use std::old_io::fs::PathExtensions;
-use std::path::GenericPath;
+use std::old_path::GenericPath;
 use getopts::{
     getopts,
     optflag,

src/nice/nice.rs

@@ -1,5 +1,5 @@
 #![crate_name = "nice"]
-#![feature(collections, core, libc, os, rustc_private, std_misc)]
+#![feature(collections, core, os, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/nl/nl.rs

@@ -21,7 +21,7 @@ use std::old_io::BufferedReader;
 use std::old_io::fs::File;
 use std::iter::repeat;
 use std::num::Int;
-use std::path::Path;
+use std::old_path::Path;
 use getopts::{optopt, optflag, getopts, usage, OptGroup};
 
 #[path="../common/util.rs"]

src/nohup/nohup.rs

@@ -1,5 +1,5 @@
 #![crate_name = "nohup"]
-#![feature(collections, core, io, libc, os, path, rustc_private, std_misc)]
+#![feature(collections, core, io, os, path, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/paste/paste.rs

@@ -1,5 +1,5 @@
 #![crate_name = "paste"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/printenv/printenv.rs

@@ -1,5 +1,5 @@
 #![crate_name = "printenv"]
-#![feature(collections, core, io, libc, os, rustc_private)]
+#![feature(collections, core, io, os, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/pwd/pwd.rs

@@ -1,5 +1,5 @@
 #![crate_name = "pwd"]
-#![feature(collections, core, io, libc, os, rustc_private)]
+#![feature(collections, core, io, os, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/realpath/realpath.rs

@@ -1,5 +1,5 @@
 #![crate_name= "realpath"]
-#![feature(collections, core, io, libc, os, path, rustc_private)]
+#![feature(collections, core, io, os, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/relpath/relpath.rs

@@ -1,5 +1,5 @@
 #![crate_name = "relpath"]
-#![feature(collections, core, libc, os, path, rustc_private)]
+#![feature(collections, core, os, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/rm/rm.rs

@@ -1,5 +1,5 @@
 #![crate_name = "rm"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/rmdir/rmdir.rs

@@ -1,5 +1,5 @@
 #![crate_name = "rmdir"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/seq/seq.rs

@@ -1,5 +1,5 @@
 #![crate_name = "seq"]
-#![feature(collections, core, libc, rustc_private)]
+#![feature(collections, core, rustc_private)]
 
 // TODO: Make -w flag work with decimals
 // TODO: Support -f flag

src/shuf/shuf.rs

@@ -1,5 +1,5 @@
 #![crate_name = "shuf"]
-#![feature(collections, core, io, libc, path, rand, rustc_private)]
+#![feature(collections, core, io, path, rand, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/sleep/sleep.rs

@@ -1,5 +1,5 @@
 #![crate_name = "sleep"]
-#![feature(collections, core, io, libc, rustc_private, std_misc)]
+#![feature(collections, core, io, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/sort/sort.rs

@@ -160,7 +160,7 @@ fn open<'a>(path: &str) -> Option<(Box<Reader + 'a>, bool)> {
         return Some((Box::new(stdin) as Box<Reader>, interactive));
     }
 
-    match File::open(&std::path::Path::new(path)) {
+    match File::open(&std::old_path::Path::new(path)) {
         Ok(f) => Some((Box::new(f) as Box<Reader>, false)),
         Err(e) => {
             show_error!("sort: {0}: {1}", path, e.to_string());

src/split/split.rs

@@ -1,5 +1,5 @@
 #![crate_name = "split"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/stdbuf/libstdbuf.rs

@@ -1,6 +1,6 @@
 #![crate_name = "libstdbuf"]
 #![crate_type = "staticlib"]
-#![feature(core, libc, os)]
+#![feature(core, os)]
 
 extern crate libc;
 use libc::{c_int, size_t, c_char, FILE, _IOFBF, _IONBF, _IOLBF, setvbuf};

src/stdbuf/stdbuf.rs

@@ -1,5 +1,5 @@
 #![crate_name = "stdbuf"]
-#![feature(core, io, libc, os, path, rustc_private, unicode)]
+#![feature(core, io, os, path, rustc_private, unicode)]
 
 /*
 * This file is part of the uutils coreutils package.

src/sum/sum.rs

@@ -1,5 +1,5 @@
 #![crate_name = "sum"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
 * This file is part of the uutils coreutils package.

src/sync/sync.rs

@@ -1,5 +1,5 @@
 #![crate_name = "sync"]
-#![feature(collections, libc, rustc_private)]
+#![feature(collections, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/tac/tac.rs

@@ -1,5 +1,5 @@
 #![crate_name = "tac"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/tail/tail.rs

@@ -17,7 +17,7 @@ use std::char::CharExt;
 use std::old_io::{stdin, stdout};
 use std::old_io::{BufferedReader, BytesReader};
 use std::old_io::fs::File;
-use std::path::Path;
+use std::old_path::Path;
 use std::str::from_utf8;
 use getopts::{optopt, optflag, getopts, usage};
 use std::collections::ring_buf::RingBuf;

src/test/test.rs

@@ -1,5 +1,5 @@
 #![crate_name = "test"]
-#![feature(core, libc, os, std_misc)]
+#![feature(core, os, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -384,7 +384,7 @@ fn path(path: &[u8], cond: PathCondition) -> bool {
 fn path(path: &[u8], cond: PathCondition) -> bool {
     use std::old_io::{TypeFile, TypeDirectory, TypeBlockSpecial, TypeNamedPipe};
     use std::old_io::fs::{stat};
-    use std::path::{Path};
+    use std::old_path::{Path};
 
     let path = match Path::new_opt(path) {
         Some(p) => p,

src/timeout/timeout.rs

@@ -1,5 +1,5 @@
 #![crate_name = "timeout"]
-#![feature(collections, core, io, libc, rustc_private)]
+#![feature(collections, core, io, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/truncate/truncate.rs

@@ -1,5 +1,5 @@
 #![crate_name = "truncate"]
-#![feature(collections, core, io, libc, path, rustc_private, std_misc)]
+#![feature(collections, core, io, path, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/tsort/tsort.rs

@@ -1,5 +1,5 @@
 #![crate_name = "tsort"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/tty/tty.rs

@@ -1,5 +1,5 @@
 #![crate_name = "tty"]
-#![feature(collections, core, io, libc, rustc_private, std_misc)]
+#![feature(collections, core, io, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/uname/uname.rs

@@ -1,5 +1,5 @@
 #![crate_name = "uname"]
-#![feature(collections, core, io, libc, rustc_private, std_misc)]
+#![feature(collections, core, io, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/unexpand/unexpand.rs

@@ -1,5 +1,5 @@
 #![crate_name = "unexpand"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/unlink/unlink.rs

@@ -1,5 +1,5 @@
 #![crate_name = "unlink"]
-#![feature(collections, core, io, libc, path, rustc_private)]
+#![feature(collections, core, io, path, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.

src/uptime/uptime.rs

@@ -1,5 +1,5 @@
 #![crate_name = "uptime"]
-#![feature(collections, core, io, libc, path, rustc_private, std_misc)]
+#![feature(collections, core, io, path, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/users/users.rs

@@ -1,5 +1,5 @@
 #![crate_name = "users"]
-#![feature(collections, core, io, libc, rustc_private, std_misc)]
+#![feature(collections, core, io, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/wc/wc.rs

@@ -1,5 +1,5 @@
 #![crate_name = "wc"]
-#![feature(collections, core, io, libc, path, rustc_private, std_misc)]
+#![feature(collections, core, io, path, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/whoami/whoami.rs

@@ -1,5 +1,5 @@
 #![crate_name = "whoami"]
-#![feature(collections, core, io, libc, rustc_private, std_misc)]
+#![feature(collections, core, io, rustc_private, std_misc)]
 
 /*
  * This file is part of the uutils coreutils package.

src/yes/yes.rs

@@ -1,5 +1,5 @@
 #![crate_name = "yes"]
-#![feature(collections, core, io, libc, rustc_private)]
+#![feature(collections, core, io, rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.