---

yaml
---
r: 148198
b: refs/heads/try2
c: e19b1b1
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: d578ecc4072a0e0fade7d564f0ae6dac31c3fb45
+refs/heads/try2: e19b1b129b266900f832a50f0ea50342471e414c
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/docs.mk

@@ -308,6 +308,7 @@ $(eval $(call libdoc,std,$(STDLIB_CRATE),$(CFG_BUILD)))
 $(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(CFG_BUILD)))
 $(eval $(call libdoc,native,$(LIBNATIVE_CRATE),$(CFG_BUILD)))
 $(eval $(call libdoc,green,$(LIBGREEN_CRATE),$(CFG_BUILD)))
+$(eval $(call libdoc,rustuv,$(LIBRUSTUV_CRATE),$(CFG_BUILD)))
 
 $(eval $(call compiledoc,rustc,$(COMPILER_CRATE),$(CFG_BUILD)))
 $(eval $(call compiledoc,syntax,$(LIBSYNTAX_CRATE),$(CFG_BUILD)))

branches/try2/mk/install.mk

@@ -194,7 +194,7 @@ uninstall:
         ; \
         do rm -f $$i ; \
         done
-	$(Q)rm -Rf $(PHL)/rustc
+	$(Q)rm -Rf $(PHL)/$(CFG_RUSTLIBDIR)
 	$(Q)rm -f $(CFG_MANDIR)/man1/rustc.1
 	$(Q)rm -f $(CFG_MANDIR)/man1/rustdoc.1
 	$(Q)rm -f $(CFG_MANDIR)/man1/rusti.1

branches/try2/src/librustc/middle/borrowck/check_loans.rs

@@ -24,8 +24,10 @@ use middle::moves;
 use middle::ty;
 use syntax::ast::{MutImmutable, MutMutable};
 use syntax::ast;
+use syntax::ast_map;
 use syntax::ast_util;
 use syntax::codemap::Span;
+use syntax::parse::token;
 use syntax::visit::Visitor;
 use syntax::visit;
 use util::ppaux::Repr;
@@ -77,6 +79,7 @@ pub fn check_loans(bccx: &BorrowckCtxt,
     clcx.visit_block(body, ());
 }
 
+#[deriving(Eq)]
 enum MoveError {
     MoveOk,
     MoveWhileBorrowed(/*loan*/@LoanPath, /*loan*/Span)
@@ -125,6 +128,9 @@ impl<'a> CheckLoanCtxt<'a> {
         //! given `loan_path`
 
         self.each_in_scope_loan(scope_id, |loan| {
+            debug!("each_in_scope_restriction found loan: {:?}",
+                   loan.repr(self.tcx()));
+
             let mut ret = true;
             for restr in loan.restrictions.iter() {
                 if restr.loan_path == loan_path {
@@ -647,22 +653,34 @@ impl<'a> CheckLoanCtxt<'a> {
 
     pub fn analyze_move_out_from(&self,
                                  expr_id: ast::NodeId,
-                                 move_path: @LoanPath) -> MoveError {
+                                 mut move_path: @LoanPath)
+                                 -> MoveError {
         debug!("analyze_move_out_from(expr_id={:?}, move_path={})",
-               expr_id, move_path.repr(self.tcx()));
-
-        // FIXME(#4384) inadequare if/when we permit `move a.b`
-
-        let mut ret = MoveOk;
+               ast_map::node_id_to_str(self.tcx().items,
+                                       expr_id,
+                                       token::get_ident_interner()),
+               move_path.repr(self.tcx()));
+
+        // We must check every element of a move path. See
+        // `borrowck-move-subcomponent.rs` for a test case.
+        loop {
+            // check for a conflicting loan:
+            let mut ret = MoveOk;
+            self.each_in_scope_restriction(expr_id, move_path, |loan, _| {
+                // Any restriction prevents moves.
+                ret = MoveWhileBorrowed(loan.loan_path, loan.span);
+                false
+            });
 
-        // check for a conflicting loan:
-        self.each_in_scope_restriction(expr_id, move_path, |loan, _| {
-            // Any restriction prevents moves.
-            ret = MoveWhileBorrowed(loan.loan_path, loan.span);
-            false
-        });
+            if ret != MoveOk {
+                return ret
+            }
 
-        ret
+            match *move_path {
+                LpVar(_) => return MoveOk,
+                LpExtend(subpath, _, _) => move_path = subpath,
+            }
+        }
     }
 
     pub fn check_call(&self,

branches/try2/src/librustc/middle/borrowck/mod.rs

@@ -872,7 +872,10 @@ impl Repr for LoanPath {
     fn repr(&self, tcx: ty::ctxt) -> ~str {
         match self {
             &LpVar(id) => {
-                format!("$({:?})", id)
+                format!("$({})",
+                        ast_map::node_id_to_str(tcx.items,
+                                                id,
+                                                token::get_ident_interner()))
             }
 
             &LpExtend(lp, _, LpDeref(_)) => {

branches/try2/src/librustdoc/html/render.rs

@@ -157,6 +157,7 @@ pub struct Cache {
     priv stack: ~[~str],
     priv parent_stack: ~[ast::NodeId],
     priv search_index: ~[IndexItem],
+    priv privmod: bool,
 }
 
 /// Helper struct to render all source code to HTML pages
@@ -241,6 +242,7 @@ pub fn run(mut crate: clean::Crate, dst: Path) {
         parent_stack: ~[],
         search_index: ~[],
         extern_locations: HashMap::new(),
+        privmod: false,
     };
     cache.stack.push(crate.name.clone());
     crate = cache.fold_crate(crate);
@@ -455,6 +457,16 @@ impl<'a> SourceCollector<'a> {
 
 impl DocFolder for Cache {
     fn fold_item(&mut self, item: clean::Item) -> Option<clean::Item> {
+        // If this is a private module, we don't want it in the search index.
+        let orig_privmod = match item.inner {
+            clean::ModuleItem(..) => {
+                let prev = self.privmod;
+                self.privmod = prev || item.visibility != Some(ast::Public);
+                prev
+            }
+            _ => self.privmod,
+        };
+
         // Register any generics to their corresponding string. This is used
         // when pretty-printing types
         match item.inner {
@@ -530,7 +542,7 @@ impl DocFolder for Cache {
                     _ => Some((None, self.stack.as_slice()))
                 };
                 match parent {
-                    Some((parent, path)) => {
+                    Some((parent, path)) if !self.privmod => {
                         self.search_index.push(IndexItem {
                             ty: shortty(&item),
                             name: s.to_owned(),
@@ -539,7 +551,7 @@ impl DocFolder for Cache {
                             parent: parent,
                         });
                     }
-                    None => {}
+                    Some(..) | None => {}
                 }
             }
             None => {}
@@ -612,8 +624,12 @@ impl DocFolder for Cache {
                     // Private modules may survive the strip-private pass if
                     // they contain impls for public types, but those will get
                     // stripped here
-                    clean::Item { inner: clean::ModuleItem(ref m), .. }
-                            if m.items.len() == 0 => None,
+                    clean::Item { inner: clean::ModuleItem(ref m),
+                                  visibility, .. }
+                            if (m.items.len() == 0 &&
+                                item.doc_value().is_none()) ||
+                               visibility != Some(ast::Public) => None,
+
                     i => Some(i),
                 }
             }
@@ -622,6 +638,7 @@ impl DocFolder for Cache {
 
         if pushed { self.stack.pop(); }
         if parent_pushed { self.parent_stack.pop(); }
+        self.privmod = orig_privmod;
         return ret;
     }
 }
@@ -1186,7 +1203,7 @@ fn item_struct(w: &mut Writer, it: &clean::Item, s: &clean::Struct) {
 
     document(w, it);
     match s.struct_type {
-        doctree::Plain => {
+        doctree::Plain if s.fields.len() > 0 => {
             write!(w, "<h2 class='fields'>Fields</h2>\n<table>");
             for field in s.fields.iter() {
                 write!(w, "<tr><td id='structfield.{name}'>\

branches/try2/src/librustdoc/lib.rs

@@ -83,6 +83,7 @@ pub fn opts() -> ~[groups::OptGroup] {
     use extra::getopts::groups::*;
     ~[
         optflag("h", "help", "show this help message"),
+        optflag("", "version", "print rustdoc's version"),
         optopt("r", "input-format", "the input type of the specified file",
                "[rust|json]"),
         optopt("w", "output-format", "the output type to write",
@@ -119,6 +120,9 @@ pub fn main_args(args: &[~str]) -> int {
     if matches.opt_present("h") || matches.opt_present("help") {
         usage(args[0]);
         return 0;
+    } else if matches.opt_present("version") {
+        rustc::version(args[0]);
+        return 0;
     }
 
     if matches.free.len() == 0 {

branches/try2/src/librustdoc/passes.rs

@@ -136,7 +136,9 @@ impl<'a> fold::DocFolder for Stripper<'a> {
             Some(i) => {
                 match i.inner {
                     // emptied modules/impls have no need to exist
-                    clean::ModuleItem(ref m) if m.items.len() == 0 => None,
+                    clean::ModuleItem(ref m)
+                        if m.items.len() == 0 &&
+                           i.doc_value().is_none() => None,
                     clean::ImplItem(ref i) if i.methods.len() == 0 => None,
                     _ => {
                         self.retained.insert(i.id);

branches/try2/src/librustpkg/parse_args.rs

@@ -36,7 +36,8 @@ pub struct ParseResult {
 /// Parses command line arguments of rustpkg.
 /// Returns a triplet (command, remaining_args, context)
 pub fn parse_args(args: &[~str]) -> Result<ParseResult, int> {
-    let opts = ~[ getopts::optflag("no-link"),
+    let opts = ~[ getopts::optflag("h"), getopts::optflag("help"),
+                                        getopts::optflag("no-link"),
                                         getopts::optflag("no-trans"),
                  // n.b. Ignores different --pretty options for now
                                         getopts::optflag("pretty"),
@@ -71,6 +72,12 @@ pub fn parse_args(args: &[~str]) -> Result<ParseResult, int> {
     let pretty = matches.opt_present("pretty");
     let emit_llvm = matches.opt_present("emit-llvm");
 
+    if matches.opt_present("h") ||
+       matches.opt_present("help") {
+         usage::general();
+         return Err(0);
+    }
+
     if matches.opt_present("v") ||
        matches.opt_present("version") {
         version(args[0]);

branches/try2/src/test/compile-fail/borrowck-move-subcomponent.rs

@@ -0,0 +1,27 @@
+// Copyright 2012-2013 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.
+
+// Tests that the borrow checker checks all components of a path when moving
+// out.
+
+#[no_std];
+
+struct S {
+  x : ~int
+}
+
+fn f<T>(_: T) {}
+
+fn main() {
+  let a : S = S { x : ~1 };
+  let pb = &a;
+  let S { x: ax } = a;  //~ ERROR cannot move out
+  f(pb);
+}