diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2014-11-26 06:01:45 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2014-12-22 12:27:07 -0500 |
| commit | 39be95c16ba3d8ed7aa5253f36c5009acb37404b (patch) | |
| tree | 00e0b44d01fdae09d4331c4e069cd95abce99e12 | |
| parent | fad1423d1ef12d3036433432d838723ff783a53d (diff) | |
| download | rust-39be95c16ba3d8ed7aa5253f36c5009acb37404b.tar.gz rust-39be95c16ba3d8ed7aa5253f36c5009acb37404b.zip | |
Insert FIXME links to issue #19925: fn item types should be zero-sized.
| -rw-r--r-- | src/librustc_trans/trans/consts.rs | 4 | ||||
| -rw-r--r-- | src/librustc_trans/trans/expr.rs | 3 | ||||
| -rw-r--r-- | src/librustc_trans/trans/type_of.rs | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/librustc_trans/trans/consts.rs b/src/librustc_trans/trans/consts.rs index 1125a2aa529..eff735e4946 100644 --- a/src/librustc_trans/trans/consts.rs +++ b/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. diff --git a/src/librustc_trans/trans/expr.rs b/src/librustc_trans/trans/expr.rs index 3e3252a347d..536ef3ffd98 100644 --- a/src/librustc_trans/trans/expr.rs +++ b/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 { diff --git a/src/librustc_trans/trans/type_of.rs b/src/librustc_trans/trans/type_of.rs index 89b728370ca..ae0c0aa5598 100644 --- a/src/librustc_trans/trans/type_of.rs +++ b/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, |