Merge pull request #148 from Arcterus/master

Update for latest Rust

Makefile

@@ -97,6 +97,7 @@ clean: $(addprefix clean_,$(EXES))
 	$(RM) -rf build tmp
 
 build:
+	git submodule update --init
 	mkdir build
 
 tmp:

base64/base64.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="base64", vers="1.0.0", author="Jordy Dickinson")];
+#![crate_id(name="base64", vers="1.0.0", author="Jordy Dickinson")]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -9,8 +9,8 @@
  * that was distributed with this source code.
  */
 
-#[feature(phase)];
-#[feature(macro_rules)];
+#![feature(phase)]
+#![feature(macro_rules)]
 
 extern crate serialize;
 extern crate getopts;
@@ -100,10 +100,10 @@ fn decode(input: &mut Reader, ignore_garbage: bool) {
     to_decode = str::replace(to_decode, "\n", "");
 
     if ignore_garbage {
-        let standard_chars =
+        let standard_chars: ~[char] =
             bytes!("ABCDEFGHIJKLMNOPQRSTUVWXYZ",
             "abcdefghijklmnopqrstuvwxyz",
-            "0123456789+/").map(|b| char::from_u32(*b as u32).unwrap());
+            "0123456789+/").iter().map(|b| char::from_u32(*b as u32).unwrap()).collect();
 
         to_decode = to_decode
             .trim_chars(&|c| !standard_chars.contains(&c))

basename/basename.rs

@@ -1,5 +1,5 @@
-#[feature(macro_rules)];
-#[crate_id(name="basename", vers="1.0.0", author="Jimmy Lu")];
+#![feature(macro_rules)]
+#![crate_id(name="basename", vers="1.0.0", author="Jimmy Lu")]
 
 /*
  * This file is part of the uutils coreutils package.

cat/cat.rs

@@ -1,5 +1,5 @@
-#[crate_id(name="cat", vers="1.0.0", author="Seldaek")];
-#[feature(managed_boxes)];
+#![crate_id(name="cat", vers="1.0.0", author="Seldaek")]
+#![feature(managed_boxes)]
 
 /*
  * This file is part of the uutils coreutils package.

common/c_types.rs

@@ -1,4 +1,4 @@
-#[allow(dead_code, non_camel_case_types)];
+#![allow(dead_code, non_camel_case_types)]
 
 extern crate getopts;
 

common/util.rs

@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
  */
 
-#[macro_escape];
+#![macro_escape]
 
 #[macro_export]
 macro_rules! show_error(

common/utmpx.rs

@@ -1,5 +1,5 @@
-#[allow(non_camel_case_types)];
-#[allow(dead_code)];
+#![allow(non_camel_case_types)]
+#![allow(dead_code)]
 
 pub use self::utmpx::{DEFAULT_FILE,USER_PROCESS,BOOT_TIME,c_utmp};
 #[cfg(target_os = "linux")]

dirname/dirname.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="dirname", vers="1.0.0", author="Derek Chiang")];
+#![crate_id(name="dirname", vers="1.0.0", author="Derek Chiang")]
 
 /*
  * This file is part of the uutils coreutils package.

du/du.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="du", vers="1.0.0", author="Derek Chiang")];
+#![crate_id(name="du", vers="1.0.0", author="Derek Chiang")]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
-#[allow(uppercase_variables)];
-#[feature(macro_rules)];
+#![allow(uppercase_variables)]
+#![feature(macro_rules)]
 
 extern crate getopts;
 extern crate sync;
@@ -47,8 +47,8 @@ fn du(path: &Path, mut my_stat: FileStat,
         let read = match fs::readdir(path) {
             Ok(read) => read,
             Err(e) => {
-                writeln!(&mut stderr(), "{}: cannot read directory ‘{}‘: {}",
-                         options.program_name, path.display(), e);
+                safe_writeln!(&mut stderr(), "{}: cannot read directory ‘{}‘: {}",
+                              options.program_name, path.display(), e);
                 return ~[Arc::new(my_stat)]
             }
         };

echo/echo.rs

@@ -1,5 +1,5 @@
-#[feature(macro_rules)];
-#[crate_id(name="echo", vers="1.0.0", author="Derek Chiang")];
+#![feature(macro_rules)]
+#![crate_id(name="echo", vers="1.0.0", author="Derek Chiang")]
 
 /*
  * This file is part of the uutils coreutils package.

env/env.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="env", vers="1.0.0", author="LeoTestard")];
+#![crate_id(name="env", vers="1.0.0", author="LeoTestard")]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -11,7 +11,7 @@
 
 /* last synced with: env (GNU coreutils) 8.13 */
 
-#[allow(non_camel_case_types)];
+#![allow(non_camel_case_types)]
 
 struct options {
     ignore_env: bool,

false/false.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="false", vers="1.0.0", author="Seldaek")];
+#![crate_id(name="false", vers="1.0.0", author="Seldaek")]
 
 /*
  * This file is part of the uutils coreutils package.

fold/fold.rs

@@ -1,4 +1,4 @@
-#[crate_id(name = "fold", vers = "1.0.0", author = "Arcterus")];
+#![crate_id(name = "fold", vers = "1.0.0", author = "Arcterus")]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-#[feature(macro_rules)];
+#![feature(macro_rules)]
 
 extern crate getopts;
 

groups/groups.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="groups", vers="1.0.0", author="Alan Andrade")];
+#![crate_id(name="groups", vers="1.0.0", author="Alan Andrade")]
 /*
  * This file is part of the uutils coreutils package.
  *
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  *
  */
-#[feature(macro_rules)];
+#![feature(macro_rules)]
 
 extern crate getopts;
 

head/head.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="head", vers="1.0.0", author="Alan Andrade")];
+#![crate_id(name="head", vers="1.0.0", author="Alan Andrade")]
 /*
  * This file is part of the uutils coreutils package.
  *

hostname/hostname.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="hostname", vers="1.0.0", author="Alan Andrade")];
+#![crate_id(name="hostname", vers="1.0.0", author="Alan Andrade")]
 /*
  * This file is part of the uutils coreutils package.
  *

id/id.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="id", version="1.0.0", author="Alan Andrade")];
+#![crate_id(name="id", version="1.0.0", author="Alan Andrade")]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -13,8 +13,8 @@
  *  http://www.opensource.apple.com/source/shell_cmds/shell_cmds-118/id/id.c
  */
 
-#[allow(non_camel_case_types)];
-#[feature(macro_rules)];
+#![allow(non_camel_case_types)]
+#![feature(macro_rules)]
 extern crate getopts;
 
 use std::{libc, os};

logname/logname.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="logname", version="1.0.0", author="Benoit Benedetti")];
+#![crate_id(name="logname", version="1.0.0", author="Benoit Benedetti")]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -11,9 +11,9 @@
 
 /* last synced with: logname (GNU coreutils) 8.22 */
 
-#[allow(non_camel_case_types)];
+#![allow(non_camel_case_types)]
 
-#[feature(macro_rules)];
+#![feature(macro_rules)]
 
 extern crate getopts;
 

md5sum/md5sum.rs

@@ -1,4 +1,4 @@
-#[crate_id(name = "md5sum", vers = "1.0.0", author = "Arcterus")];
+#![crate_id(name = "md5sum", vers = "1.0.0", author = "Arcterus")]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-#[feature(macro_rules)];
+#![feature(macro_rules)]
 
 extern crate crypto = "rust-crypto";
 extern crate getopts;

mkdir/mkdir.rs

@@ -1,4 +1,4 @@
-#[crate_id(name="mkdir", vers="1.0.0", author="Nicholas Juszczak")];
+#![crate_id(name="mkdir", vers="1.0.0", author="Nicholas Juszczak")]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-#[feature(macro_rules)];
+#![feature(macro_rules)]
 
 extern crate getopts;