---

yaml
---
r: 274663
b: refs/heads/stable
c: f08626b
h: refs/heads/master
i:
  274661: 4372ee7
  274659: da1c4c0
  274655: 7a7dfc2

Author: thepowersgang

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 04f12ef4f775cf367f2e34b99d498d51e677a15e
+refs/heads/stable: f08626bc9b99eef97dbb78a8ac5f7dec958c0be7
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/man/rustc.1

@@ -6,7 +6,9 @@ rustc \- The Rust compiler
 [\fIOPTIONS\fR] \fIINPUT\fR
 
 .SH DESCRIPTION
-This program is a compiler for the Rust language, available at https://www.rust\-lang.org.
+This program is a compiler for the Rust language, available at
+.UR https://www.rust\-lang.org
+.UE .
 
 .SH OPTIONS
 
@@ -296,7 +298,10 @@ To build an executable with debug info:
 .BR rustdoc (1)
 
 .SH "BUGS"
-See https://github.com/rust\-lang/rust/issues for issues.
+See
+.UR https://github.com/rust\-lang/rust/issues
+.UE
+for issues.
 
 .SH "AUTHOR"
 See \fIAUTHORS.txt\fR in the Rust source distribution.

branches/stable/man/rustdoc.1

@@ -8,8 +8,10 @@ rustdoc \- generate documentation from Rust source code
 .SH DESCRIPTION
 This tool generates API reference documentation by extracting comments from
 source code written in the Rust language, available at
-<\fBhttps://www.rust-lang.org\fR>. It accepts several input formats and
-provides several output formats for the generated documentation.
+.UR https://www.rust\-lang.org
+.UE .
+It accepts several input formats and provides several output formats
+for the generated documentation.
 
 .SH OPTIONS
 
@@ -129,7 +131,9 @@ The generated HTML can be viewed with any standard web browser.
 .BR rustc (1)
 
 .SH "BUGS"
-See <\fBhttps://github.com/rust\-lang/rust/issues\fR>
+See
+.UR https://github.com/rust\-lang/rust/issues
+.UE
 for issues.
 
 .SH "AUTHOR"

branches/stable/src/libcore/ptr.rs

@@ -465,7 +465,7 @@ impl<T: ?Sized> PartialOrd for *mut T {
     fn ge(&self, other: &*mut T) -> bool { *self >= *other }
 }
 
-/// A wrapper around a raw non-null `*mut T` that indicates that the possessor
+/// A wrapper around a raw `*mut T` that indicates that the possessor
 /// of this wrapper owns the referent. This in turn implies that the
 /// `Unique<T>` is `Send`/`Sync` if `T` is `Send`/`Sync`, unlike a raw
 /// `*mut T` (which conveys no particular ownership semantics).  It
@@ -502,10 +502,6 @@ unsafe impl<T: Sync + ?Sized> Sync for Unique<T> { }
 #[unstable(feature = "unique", issue = "27730")]
 impl<T: ?Sized> Unique<T> {
     /// Creates a new `Unique`.
-    ///
-    /// # Safety
-    ///
-    /// `ptr` must be non-null.
     pub const unsafe fn new(ptr: *mut T) -> Unique<T> {
         Unique { pointer: NonZero::new(ptr), _marker: PhantomData }
     }
@@ -541,7 +537,7 @@ impl<T> fmt::Pointer for Unique<T> {
     }
 }
 
-/// A wrapper around a raw non-null `*mut T` that indicates that the possessor
+/// A wrapper around a raw `*mut T` that indicates that the possessor
 /// of this wrapper has shared ownership of the referent. Useful for
 /// building abstractions like `Rc<T>` or `Arc<T>`, which internally
 /// use raw pointers to manage the memory that they own.
@@ -570,10 +566,6 @@ impl<T: ?Sized> !Sync for Shared<T> { }
 #[unstable(feature = "shared", issue = "27730")]
 impl<T: ?Sized> Shared<T> {
     /// Creates a new `Shared`.
-    ///
-    /// # Safety
-    ///
-    /// `ptr` must be non-null.
     pub unsafe fn new(ptr: *mut T) -> Self {
         Shared { pointer: NonZero::new(ptr), _marker: PhantomData }
     }

branches/stable/src/librustc/middle/infer/region_inference/mod.rs

@@ -1105,14 +1105,7 @@ impl<'a, 'tcx> RegionVarBindings<'a, 'tcx> {
         for _ in 0..num_vars {
             graph.add_node(());
         }
-
-        // Issue #30438: two distinct dummy nodes, one for incoming
-        // edges (dummy_source) and another for outgoing edges
-        // (dummy_sink). In `dummy -> a -> b -> dummy`, using one
-        // dummy node leads one to think (erroneously) there exists a
-        // path from `b` to `a`. Two dummy nodes sidesteps the issue.
-        let dummy_source = graph.add_node(());
-        let dummy_sink = graph.add_node(());
+        let dummy_idx = graph.add_node(());
 
         for (constraint, _) in constraints.iter() {
             match *constraint {
@@ -1122,10 +1115,10 @@ impl<'a, 'tcx> RegionVarBindings<'a, 'tcx> {
                                    *constraint);
                 }
                 ConstrainRegSubVar(_, b_id) => {
-                    graph.add_edge(dummy_source, NodeIndex(b_id.index as usize), *constraint);
+                    graph.add_edge(dummy_idx, NodeIndex(b_id.index as usize), *constraint);
                 }
                 ConstrainVarSubReg(a_id, _) => {
-                    graph.add_edge(NodeIndex(a_id.index as usize), dummy_sink, *constraint);
+                    graph.add_edge(NodeIndex(a_id.index as usize), dummy_idx, *constraint);
                 }
             }
         }

branches/stable/src/librustc_back/target/windows_base.rs

@@ -84,6 +84,7 @@ pub fn opts() -> TargetOptions {
             "rsend.o".to_string()
         ),
         custom_unwind_resume: true,
+        exe_allocation_crate: super::maybe_jemalloc(),
 
         .. Default::default()
     }

branches/stable/src/librustc_back/target/x86_64_rumprun_netbsd.rs

@@ -21,7 +21,6 @@ pub fn target() -> Target {
     base.position_independent_executables = false;
     base.disable_redzone = true;
     base.no_default_libraries = false;
-    base.exe_allocation_crate = "alloc_system".to_string();
 
     Target {
         llvm_target: "x86_64-rumprun-netbsd".to_string(),

branches/stable/src/librustc_mir/build/expr/into.rs

@@ -63,7 +63,7 @@ impl<'a,'tcx> Builder<'a,'tcx> {
                 } else {
                     // Body of the `if` expression without an `else` clause must return `()`, thus
                     // we implicitly generate a `else {}` if it is not specified.
-                    this.cfg.push_assign_unit(else_block, expr_span, destination);
+                    this.cfg.push_assign_unit(else_block, expr_span, &Lvalue::ReturnPointer);
                     else_block
                 };
 

branches/stable/src/librustc_trans/trans/closure.rs

@@ -421,7 +421,7 @@ fn trans_fn_once_adapter_shim<'a, 'tcx>(
         }
     }, ArgVals(&llargs[(self_idx + 1)..]), dest).bcx;
 
-    fcx.pop_custom_cleanup_scope(self_scope);
+    fcx.pop_and_trans_custom_cleanup_scope(bcx, self_scope);
 
     finish_fn(&fcx, bcx, sig.output, DebugLoc::None);
 

branches/stable/src/libstd/fs.rs

@@ -1940,46 +1940,12 @@ mod tests {
         check!(fs::create_dir_all(&d2));
         check!(check!(File::create(&canary)).write(b"foo"));
         check!(symlink_junction(&d2, &dt.join("d2")));
-        let _ = symlink_file(&canary, &d1.join("canary"));
         check!(fs::remove_dir_all(&d1));
 
         assert!(!d1.is_dir());
         assert!(canary.exists());
     }
 
-    #[test]
-    fn recursive_rmdir_of_symlink() {
-        // test we do not recursively delete a symlink but only dirs.
-        let tmpdir = tmpdir();
-        let link = tmpdir.join("d1");
-        let dir = tmpdir.join("d2");
-        let canary = dir.join("do_not_delete");
-        check!(fs::create_dir_all(&dir));
-        check!(check!(File::create(&canary)).write(b"foo"));
-        check!(symlink_junction(&dir, &link));
-        check!(fs::remove_dir_all(&link));
-
-        assert!(!link.is_dir());
-        assert!(canary.exists());
-    }
-
-    #[test]
-    // only Windows makes a distinction between file and directory symlinks.
-    #[cfg(windows)]
-    fn recursive_rmdir_of_file_symlink() {
-        let tmpdir = tmpdir();
-        if !got_symlink_permission(&tmpdir) { return };
-
-        let f1 = tmpdir.join("f1");
-        let f2 = tmpdir.join("f2");
-        check!(check!(File::create(&f1)).write(b"foo"));
-        check!(symlink_file(&f1, &f2));
-        match fs::remove_dir_all(&f2) {
-            Ok(..) => panic!("wanted a failure"),
-            Err(..) => {}
-        }
-    }
-
     #[test]
     fn unicode_path_is_dir() {
         assert!(Path::new(".").is_dir());

branches/stable/src/libstd/sys/unix/fs.rs

@@ -627,19 +627,10 @@ pub fn rmdir(p: &Path) -> io::Result<()> {
 }
 
 pub fn remove_dir_all(path: &Path) -> io::Result<()> {
-    let filetype = try!(lstat(path)).file_type();
-    if filetype.is_symlink() {
-        unlink(path)
-    } else {
-        remove_dir_all_recursive(path)
-    }
-}
-
-fn remove_dir_all_recursive(path: &Path) -> io::Result<()> {
     for child in try!(readdir(path)) {
         let child = try!(child);
         if try!(child.file_type()).is_dir() {
-            try!(remove_dir_all_recursive(&child.path()));
+            try!(remove_dir_all(&child.path()));
         } else {
             try!(unlink(&child.path()));
         }

branches/stable/src/libstd/sys/windows/fs.rs

@@ -552,22 +552,11 @@ pub fn rmdir(p: &Path) -> io::Result<()> {
 }
 
 pub fn remove_dir_all(path: &Path) -> io::Result<()> {
-    let filetype = try!(lstat(path)).file_type();
-    if filetype.is_symlink() {
-        // On Windows symlinks to files and directories are removed differently.
-        // rmdir only deletes dir symlinks and junctions, not file symlinks.
-        rmdir(path)
-    } else {
-        remove_dir_all_recursive(path)
-    }
-}
-
-fn remove_dir_all_recursive(path: &Path) -> io::Result<()> {
     for child in try!(readdir(path)) {
         let child = try!(child);
         let child_type = try!(child.file_type());
         if child_type.is_dir() {
-            try!(remove_dir_all_recursive(&child.path()));
+            try!(remove_dir_all(&child.path()));
         } else if child_type.is_symlink_dir() {
             try!(rmdir(&child.path()));
         } else {

branches/stable/src/test/compile-fail/issue-30438-a.rs

@@ -0,0 +1,32 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+struct Foo<'a>(&'a mut bool);
+
+impl<'a> Drop for Foo<'a> {
+    fn drop(&mut self) {
+        *self.0 = true;
+    }
+}
+
+fn f<T: FnOnce()>(t: T) {
+    t()
+}
+
+fn main() {
+    let mut ran_drop = false;
+    {
+        let x = Foo(&mut ran_drop);
+        let x = move || { let _ = x; };
+        f(x);
+    }
+    assert!(ran_drop);
+}
+