---

yaml
---
r: 81900
b: refs/heads/master
c: 56d415a
h: refs/heads/master
v: v3

Author: Branimir

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a268a1c4bb3867e4f8b050e07fd216e561b50521
+refs/heads/master: 56d415aa60b41e171890cb76a323cb95d617b077
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/.gitattributes

@@ -4,7 +4,6 @@
 *.cpp rust
 *.h rust
 *.rs rust
-src/etc/pkg/rust-logo.ico binary
 src/rt/msvc/* -whitespace
 src/rt/vg/* -whitespace
 src/rt/linenoise/* -whitespace

trunk/RELEASES.txt

@@ -1,7 +1,7 @@
-Version 0.8 (September 2013)
+Version 0.8 (October 2013)
 --------------------------
 
-   * ~2200 changes, numerous bugfixes
+   * ~2100 changes, numerous bugfixes
 
    * Language
       * The `for` loop syntax has changed to work with the `Iterator` trait.

trunk/configure

@@ -684,7 +684,7 @@ do
       isaac linenoise sync test \
       arch/i386 arch/x86_64 arch/arm arch/mips  \
       libuv libuv/src/ares libuv/src/eio libuv/src/ev \
-      jemalloc sundown/src sundown/html
+      jemalloc
     do
       make_dir $t/rt/stage$s/$i
     done

trunk/mk/rt.mk

@@ -82,16 +82,7 @@ RUNTIME_CXXS_$(1)_$(2) := \
               rt/rust_android_dummy.cpp \
               rt/rust_test_helpers.cpp
 
-RUNTIME_CS_$(1)_$(2) := rt/linenoise/linenoise.c \
-			rt/linenoise/utf8.c \
-			rt/sundown/src/autolink.c \
-			rt/sundown/src/buffer.c \
-			rt/sundown/src/stack.c \
-			rt/sundown/src/markdown.c \
-			rt/sundown/html/houdini_href_e.c \
-			rt/sundown/html/houdini_html_e.c \
-			rt/sundown/html/html_smartypants.c \
-			rt/sundown/html/html.c
+RUNTIME_CS_$(1)_$(2) := rt/linenoise/linenoise.c rt/linenoise/utf8.c
 
 RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
 			rt/arch/$$(HOST_$(1))/ccall.S \
@@ -126,8 +117,6 @@ RUNTIME_DEF_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/rustrt$$(CFG_DEF_SUFFIX_$(1))
 RUNTIME_INCS_$(1)_$(2) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
                      -I $$(S)src/rt/arch/$$(HOST_$(1)) \
                      -I $$(S)src/rt/linenoise \
-                     -I $$(S)src/rt/sundown/src \
-                     -I $$(S)src/rt/sundown/html \
                      -I $$(S)src/libuv/include
 RUNTIME_OBJS_$(1)_$(2) := $$(RUNTIME_CXXS_$(1)_$(2):rt/%.cpp=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \
                      $$(RUNTIME_CS_$(1)_$(2):rt/%.c=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \

trunk/mk/tests.mk

@@ -227,9 +227,8 @@ ALL_CS := $(wildcard $(S)src/rt/*.cpp \
                      $(S)src/rt/*/*/*.cpp \
                      $(S)src/rustllvm/*.cpp)
 ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
-		       $(wildcard $(S)src/rt/linenoise/*.c) \
-		       $(wildcard $(S)src/rt/sundown/src/*.c) \
-		       $(wildcard $(S)src/rt/sundown/html/*.c) \
+                       $(S)src/rt/linenoise/linenoise.c \
+                       $(S)src/rt/linenoise/utf8.c \
 	,$(ALL_CS))
 ALL_HS := $(wildcard $(S)src/rt/*.h \
                      $(S)src/rt/*/*.h \
@@ -242,8 +241,6 @@ ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
                        $(S)src/rt/msvc/inttypes.h \
                        $(S)src/rt/linenoise/linenoise.h \
                        $(S)src/rt/linenoise/utf8.h \
-		       $(wildcard $(S)src/rt/sundown/src/*.h) \
-		       $(wildcard $(S)src/rt/sundown/html/*.h) \
 	,$(ALL_HS))
 
 # Run the tidy script in multiple parts to avoid huge 'echo' commands

trunk/src/etc/pkg/rust-logo.ico

@@ -17,7 +17,7 @@
  * In this example, a large vector of floats is shared between several tasks.
  * With simple pipes, without Arc, a copy would have to be made for each task.
  *
- * ```rust
+ * ~~~ {.rust}
  * extern mod std;
  * use extra::arc;
  * let numbers=vec::from_fn(100, |ind| (ind as float)*rand::random());
@@ -34,7 +34,7 @@
  *           // Work with the local numbers
  *       }
  *   }
- * ```
+ * ~~~
  */
 
 #[allow(missing_doc)];
@@ -440,7 +440,7 @@ impl<T:Freeze + Send> RWArc<T> {
      *
      * # Example
      *
-     * ```rust
+     * ~~~ {.rust}
      * do arc.write_downgrade |mut write_token| {
      *     do write_token.write_cond |state, condvar| {
      *         ... exclusive access with mutable state ...
@@ -450,7 +450,7 @@ impl<T:Freeze + Send> RWArc<T> {
      *         ... shared access with immutable state ...
      *     }
      * }
-     * ```
+     * ~~~
      */
     pub fn write_downgrade<U>(&self, blk: &fn(v: RWWriteMode<T>) -> U) -> U {
         unsafe {

trunk/src/libextra/arc.rs

@@ -62,15 +62,15 @@ impl<'self> ToBase64 for &'self [u8] {
      *
      * # Example
      *
-     * ```rust
+     * ~~~ {.rust}
      * extern mod extra;
      * use extra::base64::{ToBase64, standard};
      *
      * fn main () {
      *     let str = [52,32].to_base64(standard);
      *     printfln!("%s", str);
      * }
-     * ```
+     * ~~~
      */
     fn to_base64(&self, config: Config) -> ~str {
         let bytes = match config.char_set {
@@ -170,7 +170,7 @@ impl<'self> FromBase64 for &'self str {
      *
      * This converts a string literal to base64 and back.
      *
-     * ```rust
+     * ~~~ {.rust}
      * extern mod extra;
      * use extra::base64::{ToBase64, FromBase64, standard};
      * use std::str;
@@ -183,7 +183,7 @@ impl<'self> FromBase64 for &'self str {
      *     let result_str = str::from_utf8(bytes);
      *     printfln!("%s", result_str);
      * }
-     * ```
+     * ~~~
      */
     fn from_base64(&self) -> Result<~[u8], ~str> {
         let mut r = ~[];

trunk/src/libextra/base64.rs

@@ -352,7 +352,6 @@ mod test {
 
     use cryptoutil::{add_bytes_to_bits, add_bytes_to_bits_tuple};
     use digest::Digest;
-    use hex::FromHex;
 
     /// Feed 1,000,000 'a's into the digest with varying input sizes and check that the result is
     /// correct.
@@ -373,10 +372,8 @@ mod test {
         }
 
         let result_str = digest.result_str();
-        let result_bytes = digest.result_bytes();
 
-        assert_eq!(expected, result_str.as_slice());
-        assert_eq!(expected.from_hex().unwrap(), result_bytes);
+        assert!(expected == result_str);
     }
 
     // A normal addition - no overflow occurs

trunk/src/libextra/crypto/cryptoutil.rs

@@ -10,8 +10,6 @@
 
 use std::vec;
 
-use hex::ToHex;
-
 
 /**
  * The Digest trait specifies an interface common to digest functions, such as SHA-1 and the SHA-2
@@ -60,20 +58,23 @@ pub trait Digest {
 
     /**
      * Convenience function that retrieves the result of a digest as a
-     * newly allocated vec of bytes.
+     * ~str in hexadecimal format.
      */
-    fn result_bytes(&mut self) -> ~[u8] {
+    fn result_str(&mut self) -> ~str {
         let mut buf = vec::from_elem((self.output_bits()+7)/8, 0u8);
         self.result(buf);
-        buf
+        return to_hex(buf);
     }
+}
 
-    /**
-     * Convenience function that retrieves the result of a digest as a
-     * ~str in hexadecimal format.
-     */
-    fn result_str(&mut self) -> ~str {
-        self.result_bytes().to_hex()
+fn to_hex(rr: &[u8]) -> ~str {
+    let mut s = ~"";
+    for b in rr.iter() {
+        let hex = (*b as uint).to_str_radix(16u);
+        if hex.len() == 1 {
+            s.push_char('0');
+        }
+        s.push_str(hex);
     }
+    return s;
 }
-

trunk/src/libextra/crypto/digest.rs

@@ -26,7 +26,8 @@ Rust extras are part of the standard Rust distribution.
        url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
 
 #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
-      html_favicon_url = "http://www.rust-lang.org/favicon.ico")];
+      html_favicon_url = "http://www.rust-lang.org/favicon.ico",
+      passes = "strip-hidden")];
 
 #[comment = "Rust extras"];
 #[license = "MIT/ASL2"];

trunk/src/libextra/extra.rs

@@ -25,7 +25,7 @@ ports and channels.
 
 This example sends boxed integers across tasks using serialization.
 
-```rust
+~~~ {.rust}
 let (port, chan) = serial::pipe_stream();
 
 do task::spawn || {
@@ -37,7 +37,7 @@ do task::spawn || {
 for i in range(0, 10) {
     assert @i == port.recv()
 }
- ```
+~~~
 
 # Safety Note
 

trunk/src/libextra/flatpipes.rs

@@ -14,13 +14,13 @@
  *
  * # Example
  *
- * ```rust
+ * ~~~ {.rust}
  * # fn fib(n: uint) -> uint {42};
  * # fn make_a_sandwich() {};
  * let mut delayed_fib = extra::future::spawn (|| fib(5000) );
  * make_a_sandwich();
  * printfln!("fib(5000) = %?", delayed_fib.get())
- * ```
+ * ~~~
  */
 
 #[allow(missing_doc)];

trunk/src/libextra/future.rs

@@ -29,7 +29,7 @@
 //! that requires an input file to be specified, accepts an optional output
 //! file name following -o, and accepts both -h and --help as optional flags.
 //!
-//! ~~~{.rust}
+//! ```
 //! exter mod extra;
 //! use extra::getopts::*;
 //! use std::os;
@@ -75,7 +75,7 @@
 //!     };
 //!     do_work(input, output);
 //! }
-//! ~~~
+//! ```
 
 use std::cmp::Eq;
 use std::result::{Err, Ok};

trunk/src/libextra/getopts.rs

@@ -51,18 +51,18 @@ pub struct GlobIterator {
  * Consider a directory `/media/pictures` containing only the files `kittens.jpg`,
  * `puppies.jpg` and `hamsters.gif`:
  *
- * ```rust
+ * ~~~ {.rust}
  * for path in glob("/media/pictures/*.jpg") {
  *     println(path.to_str());
  * }
- * ```
+ * ~~~
  *
  * The above code will print:
  *
- * ```
+ * ~~~
  * /media/pictures/kittens.jpg
  * /media/pictures/puppies.jpg
- * ```
+ * ~~~
  */
 pub fn glob(pattern: &str) -> GlobIterator {
     glob_with(pattern, MatchOptions::new())
@@ -270,11 +270,11 @@ impl Pattern {
      *
      * # Example
      *
-     * ```rust
+     * ~~~ {.rust}
      * assert!(Pattern::new("c?t").matches("cat"));
      * assert!(Pattern::new("k[!e]tteh").matches("kitteh"));
      * assert!(Pattern::new("d*g").matches("doog"));
-     * ```
+     * ~~~
      */
     pub fn matches(&self, str: &str) -> bool {
         self.matches_with(str, MatchOptions::new())
@@ -492,13 +492,13 @@ impl MatchOptions {
      *
      * This function always returns this value:
      *
-     * ```rust
+     * ~~~ {.rust}
      * MatchOptions {
      *     case_sensitive: true,
      *     require_literal_separator: false.
      *     require_literal_leading_dot: false
      * }
-     * ```
+     * ~~~
      */
     pub fn new() -> MatchOptions {
         MatchOptions {

trunk/src/libextra/glob.rs

@@ -27,15 +27,15 @@ impl<'self> ToHex for &'self [u8] {
      *
      * # Example
      *
-     * ```rust
+     * ~~~ {.rust}
      * extern mod extra;
      * use extra::hex::ToHex;
      *
      * fn main () {
      *     let str = [52,32].to_hex();
      *     printfln!("%s", str);
      * }
-     * ```
+     * ~~~
      */
     fn to_hex(&self) -> ~str {
         let mut v = vec::with_capacity(self.len() * 2);
@@ -70,7 +70,7 @@ impl<'self> FromHex for &'self str {
      *
      * This converts a string literal to hexadecimal and back.
      *
-     * ```rust
+     * ~~~ {.rust}
      * extern mod extra;
      * use extra::hex::{FromHex, ToHex};
      * use std::str;
@@ -83,7 +83,7 @@ impl<'self> FromHex for &'self str {
      *     let result_str = str::from_utf8(bytes);
      *     printfln!("%s", result_str);
      * }
-     * ```
+     * ~~~
      */
     fn from_hex(&self) -> Result<~[u8], ~str> {
         // This may be an overestimate if there is any whitespace

trunk/src/libextra/hex.rs

@@ -578,7 +578,7 @@ impl RWLock {
      *
      * # Example
      *
-     * ```rust
+     * ~~~ {.rust}
      * do lock.write_downgrade |mut write_token| {
      *     do write_token.write_cond |condvar| {
      *         ... exclusive access ...
@@ -588,7 +588,7 @@ impl RWLock {
      *         ... shared access ...
      *     }
      * }
-     * ```
+     * ~~~
      */
     pub fn write_downgrade<U>(&self, blk: &fn(v: RWLockWriteMode) -> U) -> U {
         // Implementation slightly different from the slicker 'write's above.