about summary refs log tree commit diff
path: root/src/librustc/ty/instance.rs
diff options
context:
space:
mode:
authorWesley Wiser <wwiser@gmail.com>2018-01-30 22:39:23 -0500
committerWesley Wiser <wwiser@gmail.com>2018-03-06 19:58:02 -0500
commit4f840a683aebb40a4eec0285a49962dfbc8f425b (patch)
tree42a46993b1e9c9ecd2658f41aa4cc29bbf3e012d /src/librustc/ty/instance.rs
parente8cd6cc23783a6a020d2c14f1a0f343a6267195d (diff)
Add `inline` to `TransFnAttrs`
Part of #47320
Diffstat (limited to 'src/librustc/ty/instance.rs')
-rw-r--r--src/librustc/ty/instance.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/librustc/ty/instance.rs b/src/librustc/ty/instance.rs
index f4b5ffbb7dc..a5f0abb9bc0 100644
--- a/src/librustc/ty/instance.rs
+++ b/src/librustc/ty/instance.rs
@@ -96,7 +96,6 @@ impl<'tcx> InstanceDef<'tcx> {
         &self,
         tcx: TyCtxt<'a, 'tcx, 'tcx>
     ) -> bool {
-        use syntax::attr::requests_inline;
         if self.is_inline(tcx) {
             return true
         }
@@ -106,8 +105,8 @@ impl<'tcx> InstanceDef<'tcx> {
             // available to normal end-users.
             return true
         }
-        requests_inline(&self.attrs(tcx)[..]) ||
-            tcx.is_const_fn(self.def_id())
+        let trans_fn_attrs = tcx.trans_fn_attrs(self.def_id());
+        trans_fn_attrs.requests_inline() || tcx.is_const_fn(self.def_id())
     }
 }