---

yaml
---
r: 234459
b: refs/heads/tmp
c: 37b1a87
h: refs/heads/master
i:
  234457: 7548ac4
  234455: b6f75b5
v: v3

Author: apasel422

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: d2e13e822a73e0ea46ae9e21afdd3155fc997f6d
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: ee00780b985b6953346eb2dfe60d364d8159a86f
+refs/heads/tmp: 37b1a8762b40717375a70755a75ac8773c382d7a
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: ab792abf1fcc28afbd315426213f6428da25c085
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/COPYRIGHT

@@ -22,104 +22,6 @@ The Rust Project includes packages written by third parties.
 The following third party packages are included, and carry
 their own copyright notices and license terms:
 
-* Two header files that are part of the Valgrind
-  package. These files are found at src/rt/valgrind/valgrind.h and
-  src/rt/valgrind/memcheck.h, within this distribution. These files
-  are redistributed under the following terms, as noted in
-  them:
-
-  for src/rt/valgrind/valgrind.h:
-
-    This file is part of Valgrind, a dynamic binary
-    instrumentation framework.
-
-    Copyright (C) 2000-2010 Julian Seward.  All rights
-    reserved.
-
-    Redistribution and use in source and binary forms, with
-    or without modification, are permitted provided that the
-    following conditions are met:
-
-    1. Redistributions of source code must retain the above
-       copyright notice, this list of conditions and the
-       following disclaimer.
-
-    2. The origin of this software must not be
-       misrepresented; you must not claim that you wrote the
-       original software.  If you use this software in a
-       product, an acknowledgment in the product
-       documentation would be appreciated but is not
-       required.
-
-    3. Altered source versions must be plainly marked as
-       such, and must not be misrepresented as being the
-       original software.
-
-    4. The name of the author may not be used to endorse or
-       promote products derived from this software without
-       specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-    NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-    USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-    OF SUCH DAMAGE.
-
-  for src/rt/valgrind/memcheck.h:
-
-    This file is part of MemCheck, a heavyweight Valgrind
-    tool for detecting memory errors.
-
-    Copyright (C) 2000-2010 Julian Seward.  All rights
-    reserved.
-
-    Redistribution and use in source and binary forms, with
-    or without modification, are permitted provided that the
-    following conditions are met:
-
-    1. Redistributions of source code must retain the above
-       copyright notice, this list of conditions and the
-       following disclaimer.
-
-    2. The origin of this software must not be
-       misrepresented; you must not claim that you wrote the
-       original software.  If you use this software in a
-       product, an acknowledgment in the product
-       documentation would be appreciated but is not
-       required.
-
-    3. Altered source versions must be plainly marked as
-       such, and must not be misrepresented as being the
-       original software.
-
-    4. The name of the author may not be used to endorse or
-       promote products derived from this software without
-       specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-    LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
-    NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-    INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-    USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-    USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-    OF SUCH DAMAGE.
-
 * The src/rt/miniz.c file, carrying an implementation of
   RFC1950/RFC1951 DEFLATE, by Rich Geldreich
   <[email protected]>. All uses of this file are

branches/tmp/src/doc/trpl/macros.md

@@ -313,7 +313,7 @@ fn main() {
 }
 ```
 
-This works because Rust has a [hygienic macro system]. Each macro expansion
+This works because Rust has a [hygienic macro system][https://en.wikipedia.org/wiki/Hygienic_macro]. Each macro expansion
 happens in a distinct ‘syntax context’, and each variable is tagged with the
 syntax context where it was introduced. It’s as though the variable `state`
 inside `main` is painted a different "color" from the variable `state` inside

branches/tmp/src/doc/trpl/mutability.md

@@ -62,7 +62,7 @@ fn foo(mut x: i32) {
 # Interior vs. Exterior Mutability
 
 However, when we say something is ‘immutable’ in Rust, that doesn’t mean that
-it’s not able to be changed: we mean something has ‘exterior mutability’. Consider,
+it’s not able to be changed: We mean something has ‘exterior mutability’. Consider,
 for example, [`Arc<T>`][arc]:
 
 ```rust
@@ -85,8 +85,8 @@ philosophy, memory safety, and the mechanism by which Rust guarantees it, the
 > You may have one or the other of these two kinds of borrows, but not both at
 > the same time:
 > 
-> * one or more references (`&T`) to a resource,
-> * exactly one mutable reference (`&mut T`).
+> * one or more references (`&T`) to a resource.
+> * exactly one mutable reference (`&mut T`)
 
 [ownership]: ownership.html
 [borrowing]: references-and-borrowing.html#borrowing

branches/tmp/src/doc/trpl/references-and-borrowing.md

@@ -159,8 +159,8 @@ First, any borrow must last for a scope no greater than that of the owner.
 Second, you may have one or the other of these two kinds of borrows, but not
 both at the same time:
 
-* one or more references (`&T`) to a resource,
-* exactly one mutable reference (`&mut T`).
+* one or more references (`&T`) to a resource.
+* exactly one mutable reference (`&mut T`)
 
 
 You may notice that this is very similar, though not exactly the same as,
@@ -298,8 +298,8 @@ We can’t modify `v` because it’s borrowed by the loop.
 
 ### use after free
 
-References must not live longer than the resource they refer to. Rust will
-check the scopes of your references to ensure that this is true.
+References must live as long as the resource they refer to. Rust will check the
+scopes of your references to ensure that this is true.
 
 If Rust didn’t check this property, we could accidentally use a reference
 which was invalid. For example:

branches/tmp/src/librustc_back/target/dragonfly_base.rs

@@ -19,6 +19,8 @@ pub fn opts() -> TargetOptions {
         linker_is_gnu: true,
         has_rpath: true,
         pre_link_args: vec!(
+            "-L/usr/local/lib".to_string(),
+            "-L/usr/lib/gcc47".to_string(),
             // GNU-style linkers will use this to omit linking to libraries
             // which don't actually fulfill any relocations, but only for
             // libraries which follow this flag.  Thus, use it before

branches/tmp/src/librustc_trans/trans/context.rs

@@ -798,7 +798,6 @@ fn declare_intrinsic(ccx: &CrateContext, key: &str) -> Option<ValueRef> {
             if key == $name {
                 let f = declare::declare_cfn(ccx, $name, Type::func(&[], &$ret),
                                              ccx.tcx().mk_nil());
-                llvm::SetUnnamedAddr(f, false);
                 ccx.intrinsics().borrow_mut().insert($name, f.clone());
                 return Some(f);
             }
@@ -807,7 +806,6 @@ fn declare_intrinsic(ccx: &CrateContext, key: &str) -> Option<ValueRef> {
             if key == $name {
                 let f = declare::declare_cfn(ccx, $name, Type::func(&[$($arg),*], &$ret),
                                              ccx.tcx().mk_nil());
-                llvm::SetUnnamedAddr(f, false);
                 ccx.intrinsics().borrow_mut().insert($name, f.clone());
                 return Some(f);
             }

branches/tmp/src/librustdoc/html/layout.rs

@@ -62,10 +62,10 @@ r##"<!DOCTYPE html>
 
     {before_content}
 
-    <nav class="sidebar">
+    <section class="sidebar">
         {logo}
         {sidebar}
-    </nav>
+    </section>
 
     <nav class="sub">
         <form class="search-form js-only">
@@ -83,12 +83,10 @@ r##"<!DOCTYPE html>
 
     <section class="footer"></section>
 
-    <aside id="help" class="hidden">
+    <div id="help" class="hidden">
         <div>
-            <h1 class="hidden">Help</h1>
-
             <div class="shortcuts">
-                <h2>Keyboard Shortcuts</h2>
+                <h1>Keyboard Shortcuts</h1>
 
                 <dl>
                     <dt>?</dt>
@@ -105,7 +103,7 @@ r##"<!DOCTYPE html>
             </div>
 
             <div class="infos">
-                <h2>Search Tricks</h2>
+                <h1>Search Tricks</h1>
 
                 <p>
                     Prefix searches with a type followed by a colon (e.g.
@@ -125,7 +123,7 @@ r##"<!DOCTYPE html>
                 </p>
             </div>
         </div>
-    </aside>
+    </div>
 
     {after_content}
 

branches/tmp/src/librustdoc/html/static/main.css

@@ -104,7 +104,7 @@ h3.impl, h3.method, h4.method, h3.type, h4.type {
 h3.impl, h3.method, h3.type {
     margin-top: 15px;
 }
-h1, h2, h3, h4, .sidebar, a.source, .search-input, .content table :not(code)>a, .collapse-toggle {
+h1, h2, h3, h4, section.sidebar, a.source, .search-input, .content table :not(code)>a, .collapse-toggle {
     font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
@@ -189,16 +189,11 @@ nav.sub {
     padding: 0 10px;
     margin-bottom: 14px;
 }
-.block h2, .block h3 {
+.block h2 {
     margin-top: 0;
     margin-bottom: 8px;
     text-align: center;
 }
-.block ul, .block li {
-    margin: 0;
-    padding: 0;
-    list-style: none;
-}
 
 .block a {
     display: block;
@@ -386,7 +381,7 @@ nav.main .separator {
 nav.sum { text-align: right; }
 nav.sub form { display: inline; }
 
-nav.sub, .content {
+nav, .content {
     margin-left: 230px;
 }
 
@@ -412,7 +407,6 @@ a {
 .content span.method, .content a.method, .block a.current.method { color: #8c6067; }
 .content span.tymethod, .content a.tymethod, .block a.current.tymethod { color: #8c6067; }
 .content .fnname { color: #8c6067; }
-.block a.current.crate { font-weight: 500; }
 
 .search-input {
     width: 100%;
@@ -495,7 +489,7 @@ body.blur > :not(#help) {
 }
 #help dd { margin: 5px 33px; }
 #help .infos { padding-left: 0; }
-#help h1, #help h2 { margin-top: 0; }
+#help h1 { margin-top: 0; }
 #help > div div {
     width: 50%;
     float: left;

branches/tmp/src/librustdoc/html/static/main.js

@@ -773,8 +773,7 @@
         if (rootPath === '../') {
             var sidebar = $('.sidebar');
             var div = $('<div>').attr('class', 'block crate');
-            div.append($('<h3>').text('Crates'));
-            var ul = $('<ul>').appendTo(div);
+            div.append($('<h2>').text('Crates'));
 
             var crates = [];
             for (var crate in rawSearchIndex) {
@@ -789,10 +788,9 @@
                 }
                 if (rawSearchIndex[crates[i]].items[0]) {
                     var desc = rawSearchIndex[crates[i]].items[0][3];
-                    var link = $('<a>', {'href': '../' + crates[i] + '/index.html',
+                    div.append($('<a>', {'href': '../' + crates[i] + '/index.html',
                                          'title': plainSummaryLine(desc),
-                                         'class': klass}).text(crates[i]);
-                    ul.append($('<li>').append(link));
+                                         'class': klass}).text(crates[i]));
                 }
             }
             sidebar.append(div);
@@ -811,8 +809,7 @@
             if (!filtered) { return; }
 
             var div = $('<div>').attr('class', 'block ' + shortty);
-            div.append($('<h3>').text(longty));
-            var ul = $('<ul>').appendTo(div);
+            div.append($('<h2>').text(longty));
 
             for (var i = 0; i < filtered.length; ++i) {
                 var item = filtered[i];
@@ -829,10 +826,9 @@
                 } else {
                     path = shortty + '.' + name + '.html';
                 }
-                var link = $('<a>', {'href': current.relpath + path,
+                div.append($('<a>', {'href': current.relpath + path,
                                      'title': desc,
-                                     'class': klass}).text(name);
-                ul.append($('<li>').append(link));
+                                     'class': klass}).text(name));
             }
             sidebar.append(div);
         }

branches/tmp/src/libstd/ffi/c_str.rs

@@ -209,7 +209,7 @@ impl CString {
                issue = "27769")]
     #[deprecated(since = "1.4.0", reason = "renamed to from_raw")]
     pub unsafe fn from_ptr(ptr: *const libc::c_char) -> CString {
-        CString::from_raw(ptr as *mut _)
+        CString::from_raw(ptr)
     }
 
     /// Retakes ownership of a CString that was transferred to C.
@@ -219,7 +219,7 @@ impl CString {
     /// using the pointer.
     #[unstable(feature = "cstr_memory", reason = "recently added",
                issue = "27769")]
-    pub unsafe fn from_raw(ptr: *mut libc::c_char) -> CString {
+    pub unsafe fn from_raw(ptr: *const libc::c_char) -> CString {
         let len = libc::strlen(ptr) + 1; // Including the NUL byte
         let slice = slice::from_raw_parts(ptr, len as usize);
         CString { inner: mem::transmute(slice) }
@@ -237,7 +237,7 @@ impl CString {
                issue = "27769")]
     #[deprecated(since = "1.4.0", reason = "renamed to into_raw")]
     pub fn into_ptr(self) -> *const libc::c_char {
-        self.into_raw() as *const _
+        self.into_raw()
     }
 
     /// Transfers ownership of the string to a C caller.
@@ -250,8 +250,11 @@ impl CString {
     /// Failure to call `from_ptr` will lead to a memory leak.
     #[unstable(feature = "cstr_memory", reason = "recently added",
                issue = "27769")]
-    pub fn into_raw(self) -> *mut libc::c_char {
-        Box::into_raw(self.inner) as *mut libc::c_char
+    pub fn into_raw(self) -> *const libc::c_char {
+        // It is important that the bytes be sized to fit - we need
+        // the capacity to be determinable from the string length, and
+        // shrinking to fit is the only way to be sure.
+        Box::into_raw(self.inner) as *const libc::c_char
     }
 
     /// Returns the contents of this `CString` as a slice of bytes.

branches/tmp/src/libstd/macros.rs

@@ -412,9 +412,9 @@ pub mod builtin {
     #[macro_export]
     macro_rules! include_str { ($file:expr) => ({ /* compiler built-in */ }) }
 
-    /// Includes a file as a reference to a byte array.
+    /// Includes a file as a byte slice.
     ///
-    /// This macro will yield an expression of type `&'static [u8; N]` which is
+    /// This macro will yield an expression of type `&'static [u8]` which is
     /// the contents of the filename specified. The file is located relative to
     /// the current file (similarly to how modules are found),
     ///