Remove *_inlined variants

Author: Zoxc

src/librustc/dep_graph/dep_node.rs

@@ -174,18 +174,14 @@ macro_rules! define_dep_nodes {
             }
 
             #[inline(always)]
-            pub fn is_input_inlined(&self) -> bool {
+            pub fn is_input(&self) -> bool {
                 match *self {
                     $(
                         DepKind :: $variant => { contains_input_attr!($($attr),*) }
                     )*
                 }
             }
 
-            pub fn is_input(&self) -> bool {
-                self.is_input_inlined()
-            }
-
             #[inline(always)]
             pub fn is_eval_always(&self) -> bool {
                 match *self {
@@ -197,7 +193,7 @@ macro_rules! define_dep_nodes {
 
             #[allow(unreachable_code)]
             #[inline(always)]
-            pub fn has_params_inlined(&self) -> bool {
+            pub fn has_params(&self) -> bool {
                 match *self {
                     $(
                         DepKind :: $variant => {
@@ -218,10 +214,6 @@ macro_rules! define_dep_nodes {
                     )*
                 }
             }
-
-            pub fn has_params(&self) -> bool {
-                self.has_params_inlined()
-            }
         }
 
         pub enum DepConstructor<$tcx> {
@@ -326,7 +318,7 @@ macro_rules! define_dep_nodes {
             /// does not require any parameters.
             #[inline(always)]
             pub fn new_no_params(kind: DepKind) -> DepNode {
-                debug_assert!(!kind.has_params_inlined());
+                debug_assert!(!kind.has_params());
                 DepNode {
                     kind,
                     hash: Fingerprint::ZERO,

src/librustc/ty/query/plumbing.rs

@@ -424,7 +424,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
             return Ok(result);
         }
 
-        if !dep_node.kind.is_input_inlined() {
+        if !dep_node.kind.is_input() {
             if let Some(dep_node_index) = self.try_mark_green_and_read(&dep_node) {
                 profq_msg!(self, ProfileQueriesMsg::CacheHit);
                 self.sess.profiler(|p| p.record_query_hit(Q::CATEGORY));
@@ -600,7 +600,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
 
         // Ensuring an "input" or anonymous query makes no sense
         assert!(!dep_node.kind.is_anon());
-        assert!(!dep_node.kind.is_input_inlined());
+        assert!(!dep_node.kind.is_input());
         if self.try_mark_green_and_read(&dep_node).is_none() {
             // A None return from `try_mark_green_and_read` means that this is either
             // a new dep node or that the dep node has already been marked red.