---

yaml
---
r: 95019
b: refs/heads/dist-snap
c: d7e8f4c
h: refs/heads/master
i:
  95017: a145c59
  95015: e1b2021
v: v3

Author: flaper87

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: c151d371fcfb51fbf4d84f0ef266e30d64acd71a
+refs/heads/dist-snap: d7e8f4cb03e577169f78d57b74dc17877e1c96d3
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/Makefile.in

@@ -141,11 +141,11 @@ endif
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_RELEASE = 0.9-pre
+CFG_RELEASE = 0.8
 CFG_VERSION = $(CFG_RELEASE)
 # windows exe's need numeric versions - don't use anything but
 # numbers and dots here
-CFG_VERSION_WIN = 0.9
+CFG_VERSION_WIN = 0.8
 
 ifneq ($(wildcard $(CFG_GIT)),)
 ifneq ($(wildcard $(CFG_GIT_DIR)),)

branches/dist-snap/mk/clean.mk

@@ -54,8 +54,9 @@ clean-misc:
 	$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz dist
 	$(Q)rm -Rf $(foreach ext, \
                  html aux cp fn ky log pdf pg toc tp vr cps, \
-                 $(wildcard doc/*.$(ext)))
-	$(Q)find doc/std doc/extra -mindepth 1 | xargs rm -Rf
+                 $(wildcard doc/*.$(ext) \
+                            doc/*/*.$(ext) \
+                            doc/*/*/*.$(ext)))
 	$(Q)rm -Rf doc/version.md
 	$(Q)rm -Rf $(foreach sub, index styles files search javascript, \
                  $(wildcard doc/*/$(sub)))

branches/dist-snap/src/etc/kate/rust.xml

@@ -7,7 +7,7 @@
 	<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
 	<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
 ]>
-<language name="Rust" version="0.9-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
+<language name="Rust" version="0.8" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
 <highlighting>
 	<list name="fn">
 		<item> fn </item>

branches/dist-snap/src/libextra/base64.rs

@@ -68,7 +68,7 @@ impl<'self> ToBase64 for &'self [u8] {
      *
      * fn main () {
      *     let str = [52,32].to_base64(standard);
-     *     println!("{}", str);
+     *     printfln!("%s", str);
      * }
      * ```
      */
@@ -177,11 +177,11 @@ impl<'self> FromBase64 for &'self str {
      *
      * fn main () {
      *     let hello_str = "Hello, World".to_base64(standard);
-     *     println!("{}", hello_str);
+     *     printfln!("%s", hello_str);
      *     let bytes = hello_str.from_base64();
-     *     println!("{:?}", bytes);
+     *     printfln!("%?", bytes);
      *     let result_str = str::from_utf8(bytes);
-     *     println!("{}", result_str);
+     *     printfln!("%s", result_str);
      * }
      * ```
      */

branches/dist-snap/src/libextra/extra.rs

@@ -21,7 +21,7 @@ Rust extras are part of the standard Rust distribution.
 */
 
 #[link(name = "extra",
-       vers = "0.9-pre",
+       vers = "0.8",
        uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
        url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
 

branches/dist-snap/src/libextra/future.rs

@@ -19,7 +19,7 @@
  * # fn make_a_sandwich() {};
  * let mut delayed_fib = extra::future::spawn (|| fib(5000) );
  * make_a_sandwich();
- * println!("fib(5000) = {}", delayed_fib.get())
+ * printfln!("fib(5000) = %?", delayed_fib.get())
  * ```
  */
 

branches/dist-snap/src/libextra/getopts.rs

@@ -43,7 +43,7 @@
 //! }
 //!
 //! fn print_usage(program: &str, _opts: &[Opt]) {
-//!     println!("Usage: {} [options]", program);
+//!     printfln!("Usage: %s [options]", program);
 //!     println("-o\t\tOutput");
 //!     println("-h --help\tUsage");
 //! }

branches/dist-snap/src/libextra/hex.rs

@@ -33,7 +33,7 @@ impl<'self> ToHex for &'self [u8] {
      *
      * fn main () {
      *     let str = [52,32].to_hex();
-     *     println!("{}", str);
+     *     printfln!("%s", str);
      * }
      * ```
      */
@@ -77,11 +77,11 @@ impl<'self> FromHex for &'self str {
      *
      * fn main () {
      *     let hello_str = "Hello, World".to_hex();
-     *     println!("{}", hello_str);
+     *     printfln!("%s", hello_str);
      *     let bytes = hello_str.from_hex().unwrap();
-     *     println!("{:?}", bytes);
+     *     printfln!("%?", bytes);
      *     let result_str = str::from_utf8(bytes);
-     *     println!("{}", result_str);
+     *     printfln!("%s", result_str);
      * }
      * ```
      */

branches/dist-snap/src/libextra/task_pool.rs

@@ -103,6 +103,6 @@ fn test_task_pool() {
     };
     let mut pool = TaskPool::new(4, Some(SingleThreaded), f);
     do 8.times {
-        pool.execute(|i| println!("Hello from thread {}!", *i));
+        pool.execute(|i| printfln!("Hello from thread %u!", *i));
     }
 }

branches/dist-snap/src/librust/rust.rs

@@ -13,7 +13,7 @@
 // FIXME #2238 Make run only accept source that emits an executable
 
 #[link(name = "rust",
-       vers = "0.9-pre",
+       vers = "0.8",
        uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
        url = "https://github.com/mozilla/rust/tree/master/src/rust")];
 
@@ -136,13 +136,13 @@ fn cmd_help(args: &[~str]) -> ValidUsage {
         match find_cmd(command_string) {
             Some(command) => {
                 match command.action {
-                    CallMain(prog, _) => println!(
-                        "The {} command is an alias for the {} program.",
+                    CallMain(prog, _) => printfln!(
+                        "The %s command is an alias for the %s program.",
                         command.cmd, prog),
                     _       => ()
                 }
                 match command.usage_full {
-                    UsgStr(msg) => println!("{}\n", msg),
+                    UsgStr(msg) => printfln!("%s\n", msg),
                     UsgCall(f)  => f(),
                 }
                 Valid(0)
@@ -215,7 +215,7 @@ fn usage() {
 
     for command in COMMANDS.iter() {
         let padding = " ".repeat(INDENT - command.cmd.len());
-        println!("    {}{}{}", command.cmd, padding, command.usage_line);
+        printfln!("    %s%s%s", command.cmd, padding, command.usage_line);
     }
 
     io::print(

branches/dist-snap/src/librustc/front/std_inject.rs

@@ -20,7 +20,7 @@ use syntax::fold::ast_fold;
 use syntax::fold;
 use syntax::opt_vec;
 
-static STD_VERSION: &'static str = "0.9-pre";
+static STD_VERSION: &'static str = "0.8";
 
 pub fn maybe_inject_libstd_ref(sess: Session, crate: @ast::Crate)
                                -> @ast::Crate {

branches/dist-snap/src/librustc/front/test.rs

@@ -279,7 +279,7 @@ fn mk_std(cx: &TestCtxt) -> ast::view_item {
                                             path_node(~[id_extra]),
                                             ast::DUMMY_NODE_ID))])
     } else {
-        let mi = attr::mk_name_value_item_str(@"vers", @"0.9-pre");
+        let mi = attr::mk_name_value_item_str(@"vers", @"0.8");
         ast::view_item_extern_mod(id_extra, None, ~[mi], ast::DUMMY_NODE_ID)
     };
     ast::view_item {

branches/dist-snap/src/librustc/metadata/encoder.rs

@@ -1822,17 +1822,17 @@ pub fn encode_metadata(parms: EncodeParams, crate: &Crate) -> ~[u8] {
         }
 
         io::println("metadata stats:");
-        println!("    inline bytes: {}", ecx.stats.inline_bytes);
-        println!(" attribute bytes: {}", ecx.stats.attr_bytes);
-        println!("       dep bytes: {}", ecx.stats.dep_bytes);
-        println!(" lang item bytes: {}", ecx.stats.lang_item_bytes);
-        println!(" link args bytes: {}", ecx.stats.link_args_bytes);
-        println!("      impl bytes: {}", ecx.stats.impl_bytes);
-        println!("      misc bytes: {}", ecx.stats.misc_bytes);
-        println!("      item bytes: {}", ecx.stats.item_bytes);
-        println!("     index bytes: {}", ecx.stats.index_bytes);
-        println!("      zero bytes: {}", ecx.stats.zero_bytes);
-        println!("     total bytes: {}", ecx.stats.total_bytes);
+        printfln!("    inline bytes: %u", ecx.stats.inline_bytes);
+        printfln!(" attribute bytes: %u", ecx.stats.attr_bytes);
+        printfln!("       dep bytes: %u", ecx.stats.dep_bytes);
+        printfln!(" lang item bytes: %u", ecx.stats.lang_item_bytes);
+        printfln!(" link args bytes: %u", ecx.stats.link_args_bytes);
+        printfln!("      impl bytes: %u", ecx.stats.impl_bytes);
+        printfln!("      misc bytes: %u", ecx.stats.misc_bytes);
+        printfln!("      item bytes: %u", ecx.stats.item_bytes);
+        printfln!("     index bytes: %u", ecx.stats.index_bytes);
+        printfln!("      zero bytes: %u", ecx.stats.zero_bytes);
+        printfln!("     total bytes: %u", ecx.stats.total_bytes);
     }
 
     // Pad this, since something (LLVM, presumably) is cutting off the

branches/dist-snap/src/librustc/middle/borrowck/mod.rs

@@ -100,16 +100,16 @@ pub fn check_crate(
 
     if tcx.sess.borrowck_stats() {
         io::println("--- borrowck stats ---");
-        println!("paths requiring guarantees: {}",
-                 bccx.stats.guaranteed_paths);
-        println!("paths requiring loans     : {}",
-                 make_stat(bccx, bccx.stats.loaned_paths_same));
-        println!("paths requiring imm loans : {}",
-                 make_stat(bccx, bccx.stats.loaned_paths_imm));
-        println!("stable paths              : {}",
-                 make_stat(bccx, bccx.stats.stable_paths));
-        println!("paths requiring purity    : {}",
-                 make_stat(bccx, bccx.stats.req_pure_paths));
+        printfln!("paths requiring guarantees: %u",
+                  bccx.stats.guaranteed_paths);
+        printfln!("paths requiring loans     : %s",
+                  make_stat(bccx, bccx.stats.loaned_paths_same));
+        printfln!("paths requiring imm loans : %s",
+                  make_stat(bccx, bccx.stats.loaned_paths_imm));
+        printfln!("stable paths              : %s",
+                  make_stat(bccx, bccx.stats.stable_paths));
+        printfln!("paths requiring purity    : %s",
+                  make_stat(bccx, bccx.stats.req_pure_paths));
     }
 
     return (bccx.root_map, bccx.write_guard_map);