about summary refs log tree commit diff
path: root/src/librustc/ty
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-11-30 00:23:38 +0100
committerMazdak Farrokhzad <twingoow@gmail.com>2019-11-30 00:25:40 +0100
commit3d080a4a77274abd747f780b446e6fedce14fac7 (patch)
treedf823c82dfaebcc574099330709277b5830ccd9d /src/librustc/ty
parentc4375c9dfdd7f31de909f6e9384bac1bf37b44da (diff)
downloadrust-3d080a4a77274abd747f780b446e6fedce14fac7.tar.gz
rust-3d080a4a77274abd747f780b446e6fedce14fac7.zip
introduce crate rustc_feature and move active, accepted, and removed to it
Diffstat (limited to 'src/librustc/ty')
-rw-r--r--src/librustc/ty/context.rs3
-rw-r--r--src/librustc/ty/query/mod.rs1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index 95456581169..d2f9312a482 100644
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -72,7 +72,6 @@ use rustc_macros::HashStable;
 use syntax::ast;
 use syntax::attr;
 use syntax::source_map::MultiSpan;
-use syntax::feature_gate;
 use syntax::symbol::{Symbol, kw, sym};
 use syntax_pos::Span;
 use syntax::expand::allocator::AllocatorKind;
@@ -1315,7 +1314,7 @@ impl<'tcx> TyCtxt<'tcx> {
         self.cstore.allocator_kind()
     }
 
-    pub fn features(self) -> &'tcx feature_gate::Features {
+    pub fn features(self) -> &'tcx rustc_feature::Features {
         self.features_query(LOCAL_CRATE)
     }
 
diff --git a/src/librustc/ty/query/mod.rs b/src/librustc/ty/query/mod.rs
index a1eb1c43335..5b4a6ac8a2d 100644
--- a/src/librustc/ty/query/mod.rs
+++ b/src/librustc/ty/query/mod.rs
@@ -56,7 +56,6 @@ use std::any::type_name;
 use syntax_pos::{Span, DUMMY_SP};
 use syntax::attr;
 use syntax::ast;
-use syntax::feature_gate;
 use syntax::symbol::Symbol;
 
 #[macro_use]