---

yaml
---
r: 165546
b: refs/heads/master
c: 39be95c
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fad1423d1ef12d3036433432d838723ff783a53d
+refs/heads/master: 39be95c16ba3d8ed7aa5253f36c5009acb37404b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 658529467d9d69ac9e09cacf98a6d61d781c2c76
 refs/heads/try: aee614fc4973262a5a68efc643026e2b1458d65b

trunk/src/librustc_trans/trans/consts.rs

@@ -204,6 +204,10 @@ pub fn const_expr<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, e: &ast::Expr)
                                 format!("unexpected static function: {}",
                                         store).as_slice())
                 }
+                ty::AdjustReifyFnPointer(_def_id) => {
+                    // FIXME(#19925) once fn item types are
+                    // zero-sized, we'll need to do something here
+                }
                 ty::AdjustDerefRef(ref adj) => {
                     let mut ty = ety;
                     // Save the last autoderef in case we can avoid it.

trunk/src/librustc_trans/trans/expr.rs

@@ -180,6 +180,9 @@ fn apply_adjustments<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
         AdjustAddEnv(def_id, _) => {
             datum = unpack_datum!(bcx, add_env(bcx, def_id, expr, datum));
         }
+        AdjustReifyFnPointer(_def_id) => {
+            // FIXME(#19925) once fn item types are
+            // zero-sized, we'll need to do something here
         }
         AdjustDerefRef(ref adj) => {
             let (autoderefs, use_autoref) = match adj.autoref {

trunk/src/librustc_trans/trans/type_of.rs

@@ -150,7 +150,9 @@ pub fn type_of_fn_from_ty<'a, 'tcx>(cx: &CrateContext<'a, 'tcx>, fty: Ty<'tcx>)
                             f.sig.0.output,
                             f.abi)
         }
-        ty::ty_bare_fn(ref f) => {
+        ty::ty_bare_fn(_, ref f) => {
+            // FIXME(#19925) once fn item types are
+            // zero-sized, we'll need to do something here
             if f.abi == abi::Rust || f.abi == abi::RustCall {
                 type_of_rust_fn(cx,
                                 None,