---

yaml
---
r: 151166
b: refs/heads/try2
c: 1f4278d
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 1be93e61da4cd63840a0b5318785547a009e8cae
+refs/heads/try2: 1f4278d650837bf30e5461fd15c2364b2bb5ceff
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/docs.mk

@@ -141,6 +141,26 @@ doc/footer.inc: $(D)/footer.inc | doc/
 	@$(call E, cp: $@)
 	$(Q)cp -a $< $@ 2> /dev/null
 
+doc/FiraSans-Regular.woff: $(D)/FiraSans-Regular.woff | doc/
+	@$(call E, cp: $@)
+	$(Q)cp -a $< $@ 2> /dev/null
+
+doc/FiraSans-Medium.woff: $(D)/FiraSans-Medium.woff | doc/
+	@$(call E, cp: $@)
+	$(Q)cp -a $< $@ 2> /dev/null
+
+doc/Heuristica-Regular.woff: $(D)/Heuristica-Regular.woff | doc/
+	@$(call E, cp: $@)
+	$(Q)cp -a $< $@ 2> /dev/null
+
+doc/Heuristica-Italic.woff: $(D)/Heuristica-Italic.woff | doc/
+	@$(call E, cp: $@)
+	$(Q)cp -a $< $@ 2> /dev/null
+
+doc/Heuristica-Bold.woff: $(D)/Heuristica-Bold.woff | doc/
+	@$(call E, cp: $@)
+	$(Q)cp -a $< $@ 2> /dev/null
+
 # The (english) documentation for each doc item.
 
 define DEF_SHOULD_BUILD_PDF_DOC

branches/try2/src/doc/FiraSans-Medium.woff

@@ -207,12 +207,12 @@ let _ = close(Door::<Closed>("front".to_owned())); // error: mismatched types: e
 
 ## C function signature conversions
 
-Description            C signature                                    Equivalent Rust signature
----------------------- ---------------------------------------------- ------------------------------------------
-no parameters          `void foo(void);`                              `fn foo();`
-return value           `int foo(void);`                               `fn foo() -> c_int;`
-function parameters    `void foo(int x, int y);`                      `fn foo(x: c_int, y: c_int);`
-in-out pointers        `void foo(const int* in_ptr, int* out_ptr);`   `fn foo(in_ptr: *c_int, out_ptr: *mut c_int);`
+| Description         | C signature                                   | Equivalent Rust signature                      |
+|---------------------|-----------------------------------------------|------------------------------------------------|
+| no parameters       | `void foo(void);`                             | `fn foo();`                                    |
+| return value        | `int foo(void);`                              | `fn foo() -> c_int;`                           |
+| function parameters | `void foo(int x, int y);`                     | `fn foo(x: c_int, y: c_int);`                  |
+| in-out pointers     | `void foo(const int* in_ptr, int* out_ptr);`  | `fn foo(in_ptr: *c_int, out_ptr: *mut c_int);` |
 
 Note: The Rust signatures should be wrapped in an `extern "ABI" { ... }` block.
 

branches/try2/src/doc/FiraSans-Regular.woff

@@ -22,8 +22,8 @@ Some examples that demonstrate different aspects of the language:
 
 [sprocketnes]: https://github.com/pcwalton/sprocketnes
 [hash]: https://github.com/mozilla/rust/blob/master/src/libstd/hash.rs
-[HashMap]: https://github.com/mozilla/rust/blob/master/src/libstd/hashmap.rs
-[json]: https://github.com/mozilla/rust/blob/master/src/libextra/json.rs
+[HashMap]: https://github.com/mozilla/rust/blob/master/src/libcollections/hashmap.rs
+[json]: https://github.com/mozilla/rust/blob/master/src/libserialize/json.rs
 
 You may also be interested in browsing [GitHub's Rust][github-rust] page.
 

branches/try2/src/doc/Heuristica-Bold.woff

@@ -1 +1,3 @@
-<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico" />
+<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico">
+<link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400'
+        rel='stylesheet' type='text/css'>

branches/try2/src/doc/Heuristica-Italic.woff

@@ -22,10 +22,10 @@ just unique keys without a corresponding value. The `Map` and `Set` traits in
 
 The standard library provides three owned map/set types:
 
-* `std::hashmap::HashMap` and `std::hashmap::HashSet`, requiring the keys to
+* `collections::HashMap` and `collections::HashSet`, requiring the keys to
   implement `Eq` and `Hash`
-* `std::trie::TrieMap` and `std::trie::TrieSet`, requiring the keys to be `uint`
-* `extra::treemap::TreeMap` and `extra::treemap::TreeSet`, requiring the keys
+* `collections::TrieMap` and `collections::TrieSet`, requiring the keys to be `uint`
+* `collections::TreeMap` and `collections::TreeSet`, requiring the keys
   to implement `TotalOrd`
 
 These maps do not use managed pointers so they can be sent between tasks as
@@ -42,19 +42,19 @@ implementing the `Hash` trait.
 
 ## Double-ended queues
 
-The `extra::ringbuf` module implements a double-ended queue with `O(1)`
+The `collections::ringbuf` module implements a double-ended queue with `O(1)`
 amortized inserts and removals from both ends of the container. It also has
 `O(1)` indexing like a vector. The contained elements are not required to be
 copyable, and the queue will be sendable if the contained type is sendable.
-Its interface `Deque` is defined in `extra::collections`.
+Its interface `Deque` is defined in `collections`.
 
 The `extra::dlist` module implements a double-ended linked list, also
 implementing the `Deque` trait, with `O(1)` removals and inserts at either end,
 and `O(1)` concatenation.
 
 ## Priority queues
 
-The `extra::priority_queue` module implements a queue ordered by a key.  The
+The `collections::priority_queue` module implements a queue ordered by a key.  The
 contained elements are not required to be copyable, and the queue will be
 sendable if the contained type is sendable.
 

branches/try2/src/doc/Heuristica-Regular.woff

@@ -217,7 +217,7 @@ a `Sender` and `Receiver` (commonly abbreviated `tx` and `rx`).
 The `spawn` function spins up a new task,
 given a *heap allocated closure* to run.
 As you can see in the code,
-we call `chan.send()` from the original task,
+we call `tx.send()` from the original task,
 passing in our boxed array,
 and we call `rx.recv()` (short for 'receive') inside of the new task:
 values given to the `Sender` via the `send` method come out the other end via the `recv` method on the `Receiver`.

branches/try2/src/doc/complement-cheatsheet.md

@@ -14,34 +14,41 @@
     font-family: 'Fira Sans';
     font-style: normal;
     font-weight: 400;
-    src: local('Fira Sans'), url("http://www.rust-lang.org/fonts/FiraSans-Regular.woff") format('woff');
+    src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
 }
 @font-face {
     font-family: 'Fira Sans';
     font-style: normal;
     font-weight: 500;
-    src: local('Fira Sans Medium'), url("http://www.rust-lang.org/fonts/FiraSans-Medium.woff") format('woff');
+    src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
 }
 @font-face {
     font-family: 'Heuristica';
     font-style: normal;
     font-weight: 400;
-    src: local('Heuristica Regular'), url("http://www.rust-lang.org/fonts/Heuristica-Regular.woff") format('woff');
+    src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
 }
 @font-face {
     font-family: 'Heuristica';
     font-style: italic;
     font-weight: 400;
-    src: local('Heuristica Italic'), url("http://www.rust-lang.org/fonts/Heuristica-Italic.woff") format('woff');
+    src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
 }
 @font-face {
     font-family: 'Heuristica';
     font-style: normal;
     font-weight: 700;
-    src: local('Heuristica Bold'), url("http://www.rust-lang.org/fonts/Heuristica-Bold.woff") format('woff');
+    src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
 }
-/* Global page semantics
-   ========================================================================== */
+
+*:not(body) {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+/* General structure */
+
 body {
     margin: 0 auto;
     padding: 0 15px;
@@ -71,16 +78,6 @@ h1, h2, h3 {
 h1 {
     margin-bottom: 20px;
 }
-@media (min-width: 1170px) {
-    h1 {
-        margin-top: 40px;
-        margin-bottom: 30px;
-    }
-    h1, h2, h3 {
-        margin-top: 30px;
-        margin-bottom: 15px;
-    }
-}
 h4, h5, h6 {
     margin-top: 12px;
     margin-bottom: 10px;
@@ -157,8 +154,8 @@ footer {
     margin-bottom: 1em;
 }
 
-/* Links layout
-   ========================================================================== */
+/* Links layout */
+
 a {
     text-decoration: none;
     color: #428BCA;
@@ -183,18 +180,16 @@ h5 a:link, h5 a:visited {color: black;}
 h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover,
 h5 a:hover {text-decoration: none;}
 
-/* Code
-   ========================================================================== */
+/* Code */
+
 pre, code {
-    font-family: Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
-    border-radius: 4px;
+    font-family: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
 }
 pre {
-    background-color: #FDFDFD;
-    border: 1px solid #CCC;
-    border-radius: 0.5em;
+    border-left: 2px solid #eee;
     white-space: pre-wrap;
-    padding: 9.5px;
+    padding: 14px;
+    padding-right: 0;
     margin: 20px 0;
     font-size: 13px;
     word-break: break-all;
@@ -203,15 +198,12 @@ pre {
 code {
     padding: 0 2px;
     color: #8D1A38;
-    white-space: nowrap;
+    white-space: pre-wrap;
 }
 pre code {
     padding: 0;
     font-size: inherit;
     color: inherit;
-    white-space: pre-wrap;
-    background-color: transparent;
-    border-radius: 0;
 }
 
 /* Code highlighting */
@@ -225,16 +217,16 @@ pre.rust .doccomment { color: #4D4D4C; }
 pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; }
 pre.rust .lifetime { color: #B76514; }
 
+/* The rest */
 
-/* The rest
-   ========================================================================== */
 #versioninfo {
     text-align: center;
     margin: 0.5em;
     font-size: 1.1em;
 }
-@media only screen and (min-width: 768px) {
+@media (min-width: 992px) {
     #versioninfo {
+        font-size: 0.8em;
         position: fixed;
         bottom: 0px;
         right: 0px;
@@ -243,7 +235,7 @@ pre.rust .lifetime { color: #B76514; }
         background-color: #fff;
         margin: 2px;
         padding: 0 2px;
-        border-radius: .3em;
+        border-radius: .2em;
     }
 }
 #versioninfo a.hash {
@@ -252,10 +244,12 @@ pre.rust .lifetime { color: #B76514; }
 }
 
 blockquote {
-    color: black;
-    border-left: 5px solid #eee;
-    margin: 0 0 20px;
-    padding: 10px 20px;
+    color: #000;
+    margin: 20px 0;
+    padding: 15px 20px;
+    background-color: #f2f7f9;
+    border-top: .1em solid #e5eef2;
+    border-bottom: .1em solid #e5eef2;
 }
 blockquote p {
     font-size: 17px;
@@ -319,6 +313,12 @@ table th {
     padding: 5px;
 }
 
+@media (min-width: 1170px) {
+    pre {
+        font-size: 15px;
+    }
+}
+
 @media print {
     * {
         text-shadow: none !important;

branches/try2/src/doc/complement-lang-faq.md

@@ -1793,11 +1793,6 @@ spawn(proc() {
 });
 ~~~~
 
-> *Note:* If you want to see the output of `debug!` statements, you will need to turn on
-> `debug!` logging.  To enable `debug!` logging, set the RUST_LOG environment
-> variable to the name of your crate, which, for a file named `foo.rs`, will be
-> `foo` (e.g., with bash, `export RUST_LOG=foo`).
-
 ## Closure compatibility
 
 Rust closures have a convenient subtyping property: you can pass any kind of

branches/try2/src/doc/favicon.inc

@@ -12,26 +12,53 @@
 import os
 import sys
 
-# FIXME #12303 these tests are broken on windows
-if os.name == 'nt':
-    print 'ignoring make tests on windows'
-    sys.exit(0)
+# msys1/msys2 automatically converts `/abs/path1:/abs/path2` into
+# `c:\real\abs\path1;c:\real\abs\path2` (semicolons) if shell thinks
+# the value is list of paths.
+# this causes great confusion and error: shell and Makefile doesn't like
+# windows paths so it is really error-prone. revert it for peace.
+def normalize_path(v):
+    # c:\path -> /c/path
+    if ':\\' in v:
+        v = '/' + v.replace(':\\', '/')
+    v = v.replace('\\', '/')
+    return v
+
+
+def putenv(name, value):
+    if os.name == 'nt':
+        value = normalize_path(value)
+    os.putenv(name, value)
+
 
 make = sys.argv[2]
-os.putenv('RUSTC', os.path.abspath(sys.argv[3]))
-os.putenv('TMPDIR', os.path.abspath(sys.argv[4]))
-os.putenv('CC', sys.argv[5])
-os.putenv('RUSTDOC', os.path.abspath(sys.argv[6]))
+putenv('RUSTC', os.path.abspath(sys.argv[3]))
+putenv('TMPDIR', os.path.abspath(sys.argv[4]))
+putenv('CC', sys.argv[5])
+putenv('RUSTDOC', os.path.abspath(sys.argv[6]))
 filt = sys.argv[7]
 ldpath = sys.argv[8]
 if ldpath != '':
-    os.putenv(ldpath.split('=')[0], ldpath.split('=')[1])
+    name = ldpath.split('=')[0]
+    value = ldpath.split('=')[1]
+    if os.name == 'nt' and name != 'PATH':
+        value = ":".join(normalize_path(v) for v in value.split(";"))
+    os.putenv(name, value)
 
 if not filt in sys.argv[1]:
     sys.exit(0)
 print('maketest: ' + os.path.basename(os.path.dirname(sys.argv[1])))
 
-proc = subprocess.Popen([make, '-C', sys.argv[1]],
+path = sys.argv[1]
+if path[-1] == '/':
+    # msys1 has a bug that `make` fails to include `../tools.mk` (parent dir)
+    # if `-C path` option is given and `path` is absolute directory with
+    # trailing slash (`c:/path/to/test/`).
+    # the easist workaround is to remove the slash (`c:/path/to/test`).
+    # msys2 seems to fix this problem.
+    path = path[:-1]
+
+proc = subprocess.Popen([make, '-C', path],
                         stdout = subprocess.PIPE,
                         stderr = subprocess.PIPE)
 out, err = proc.communicate()

branches/try2/src/doc/guide-container.md

@@ -230,7 +230,8 @@ impl Sub<BigUint, BigUint> for BigUint {
             lo
         }).collect();
 
-        assert_eq!(borrow, 0);     // <=> assert!((self >= other));
+        assert!(borrow == 0,
+                "Cannot subtract other from self because other is larger than self.");
         return BigUint::new(diff);
     }
 }
@@ -1755,6 +1756,13 @@ mod biguint_tests {
         }
     }
 
+    #[test]
+    #[should_fail]
+    fn test_sub_fail_on_underflow() {
+        let (a, b) : (BigUint, BigUint) = (Zero::zero(), One::one());
+        a - b;
+    }
+
     static mul_triples: &'static [(&'static [BigDigit],
                                    &'static [BigDigit],
                                    &'static [BigDigit])] = &[