---

yaml
---
r: 232687
b: refs/heads/try
c: 19aadd5
h: refs/heads/master
i:
  232685: be437f6
  232683: f27baf6
  232679: 6926085
  232671: c042537
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 6887d8cdabbba06b55c2c27206e10d6f0099eee8
+refs/heads/try: 19aadd51a89f8d6f706e1eabd746039a748fa9e6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/doc/trpl/glossary.md

@@ -38,6 +38,12 @@ let z = (8, 2, 6);
 
 In the example above `x` and `y` have arity 2. `z` has arity 3.
 
+### DST (Dynamically Sized Type)
+
+A type without a statically known size or alignment. ([more info][link])
+
+[link]: ../nomicon/exotic-sizes.html#dynamically-sized-types-(dsts)
+
 ### Expression
 
 In computer programming, an expression is a combination of values, constants,

branches/try/src/liblibc/lib.rs

@@ -192,14 +192,15 @@ pub mod types {
             /// C. Use the unit type `()` or omit the return type instead.
             ///
             /// For LLVM to recognize the void pointer type and by extension
-            /// functions like malloc(), we need to have it represented as i8* in
-            /// LLVM bitcode. The enum used here ensures this and prevents misuse
-            /// of the "raw" type by only having private variants.. We need two
-            /// variants, because the compiler complains about the repr attribute
-            /// otherwise.
+            /// functions like malloc(), we need to have it represented as i8*
+            /// in LLVM bitcode. The enum used here ensures this. We need two
+            /// variants, because the compiler complains about the `repr`
+            /// attribute otherwise.
             #[repr(u8)]
             pub enum c_void {
+                #[doc(hidden)]
                 __variant1,
+                #[doc(hidden)]
                 __variant2,
             }
 

branches/try/src/librustc/ast_map/blocks.rs

@@ -191,7 +191,7 @@ impl<'a> FnLikeNode<'a> {
             visit::FkItemFn(p.ident, p.generics, p.unsafety, p.constness, p.abi, p.vis)
         };
         let closure = |_: ClosureParts| {
-            visit::FkFnBlock
+            visit::FkClosure
         };
         let method = |_, ident, sig: &'a ast::MethodSig, vis, _, _| {
             visit::FkMethod(ident, sig, vis)

branches/try/src/librustc/ast_map/mod.rs

@@ -14,6 +14,7 @@ use self::MapEntry::*;
 
 use metadata::inline::InlinedItem;
 use metadata::inline::InlinedItem as II;
+use middle::def_id::DefId;
 use syntax::abi;
 use syntax::ast::*;
 use syntax::ast_util;
@@ -378,7 +379,7 @@ impl<'ast> Map<'ast> {
         match self.find_entry(parent) {
             Some(RootInlinedParent(&InlinedParent {ii: II::TraitItem(did, _), ..})) => did,
             Some(RootInlinedParent(&InlinedParent {ii: II::ImplItem(did, _), ..})) => did,
-            _ => ast_util::local_def(parent)
+            _ => DefId::local(parent)
         }
     }
 
@@ -591,7 +592,7 @@ impl<'ast> Map<'ast> {
     }
 
     pub fn def_id_span(&self, def_id: DefId, fallback: Span) -> Span {
-        if def_id.krate == LOCAL_CRATE {
+        if def_id.is_local() {
             self.opt_span(def_id.node).unwrap_or(fallback)
         } else {
             fallback

branches/try/src/librustc/lib.rs

@@ -112,11 +112,13 @@ pub mod middle {
     pub mod check_static_recursion;
     pub mod check_loop;
     pub mod check_match;
+    pub mod check_no_asm;
     pub mod check_rvalues;
     pub mod const_eval;
     pub mod dataflow;
     pub mod dead;
     pub mod def;
+    pub mod def_id;
     pub mod dependency_format;
     pub mod effect;
     pub mod entry;